hedgewars: comparison hedgewars/uVariables.pas

equal deleted inserted replaced

-:0135e64c6c66
+:c4fd2813b127
 cNewScreenHeight   : LongInt;
 cScreenResizeDelay : LongWord;
 ipcPort            : Word;
 AprilOne           : boolean;
 cFullScreen        : boolean;
-cLocaleFName       : shortstring;
+cLanguageFName     : shortstring;
-cLocale            : shortstring;
+cLanguage          : shortstring;
 cTimerInterval     : LongInt;
 PathPrefix         : ansistring;
 UserPathPrefix     : ansistring;
 cShowFPS           : boolean;
 cFlattenFlakes     : boolean;
 cSnow              : boolean;
 isInChatMode       : boolean;
 cAltDamage         : boolean;
 cReducedQuality    : LongWord;
+cHolidaySilliness  : boolean;
 UserNick           : shortstring;
 recordFileName     : shortstring;
 cReadyDelay        : Longword;
 cStereoMode        : TStereoMode;
 cOnlyStats         : boolean;
 isInLag         : boolean;
 isPaused        : boolean;
 isInMultiShoot  : boolean;
 isSpeed         : boolean;
 isAFK           : boolean;
+isShowMission   : boolean;
+isShowGearInfo  : boolean;
+isForceMission  : boolean;
 SpeedStart      : LongWord;
 fastUntilLag    : boolean;
 fastScrolling   : boolean;
 autoCameraOn    : boolean;
 CheckSum        : LongWord;
 CampaignVariable: shortstring;
+MissionVariable : shortstring;
 GameTicks       : LongWord;
+OuchTauntTimer  : LongWord; // Timer which blocks sndOuch from being played too often and fast
 GameState       : TGameState;
 GameType        : TGameType;
 InputMask       : LongWord;
 GameFlags       : Longword;
 WorldEdge       : TWorldEdge;
 TagTurnTimeLeft : Longword;
 ReadyTimeLeft   : Longword;
 IsGetAwayTime   : boolean;
 GameOver        : boolean;
 cSuddenDTurns   : LongInt;
+LastSuddenDWarn : LongInt; // last round in which the last SD warning appeared. -2 = no warning so far
+cInitHealth     : LongInt; // initial hedgehog health (from game scheme. note the real hog health is sent directly
+// from frontend, this is only used to inform Lua scripts)
 cDamagePercent  : LongInt;
 cMineDudPercent : LongWord;
 cTemplateFilter : LongInt;
 cFeatureSize    : LongInt;
 cMapGen         : TMapGen;
 cRopePercent    : LongWord;
+cRopeNodeStep   : LongWord;
+cRopeLayers     : LongInt;
 cGetAwayTime    : LongWord;
 cAdvancedMapGenMode: boolean;
 cHedgehogTurnTime: Longword;
 cCloudsNumber    : LongWord;
 cSDCloudsNumber  : LongWord;
 cTagsMask        : byte;
 cPrevTagsMask    : byte;
-zoom             : GLfloat;
+zoom             : GLfloat; // current zoom
-ZoomValue        : GLfloat;
+ZoomValue        : GLfloat; // aimed zoom
+UserZoom         : GLfloat; // user-chosen initial and default zoom
 ChatScaleValue   : real;
 cDefaultChatScale: real;
 UIScaleValue     : real;
 cWaterLine       : LongInt;
 cLeftScreenBorder     : LongInt;
 cRightScreenBorder    : LongInt;
 cScreenSpace          : Longword;
 cCaseFactor     : Longword;
+cMaxCaseDrops   : Longword; // Max. number of crates which can be in the game when dropping
 cLandMines      : Longword;
 cAirMines       : Longword;
 cExplosives     : Longword;
 cScriptName     : shortstring;
 cScriptParam    : shortstring;
 cSeed           : shortstring;
+cIsSoundEnabled : boolean; // If the sound system is enabled
 cVolumeDelta    : LongInt;
+cVolumeUpKey    : boolean;
+cVolumeDownKey  : boolean;
 cMuteToggle     : boolean; // Mute toggle requested
 cHasFocus       : boolean;
 cInactDelay     : Longword;
 bBetweenTurns   : boolean;
 bWaterRising    : boolean;
+bDuringWaterRise: boolean;
 CrosshairX      : LongInt;
 CrosshairY      : LongInt;
+CrosshairGear   : PGear;
 CursorMovementX : LongInt;
 CursorMovementY : LongInt;
 cWaveHeight     : LongInt;
 cDrownSpeed     : hwFloat;
 cDrownSpeedf    : real;
 AmmoRect        : TSDL_Rect;
 HHTexture       : PTexture;
 cMaxZoomLevel   : real;
 cMinZoomLevel   : real;
 cZoomDelta      : real;
+cZoomDeltaSmall : real;
 cMinMaxZoomLevelDelta : real;
+cDemoClockFPSOffsetY : LongInt;
 flagMakeCapture : boolean;
 flagDumpLand    : boolean;
 RealTicks       : Longword;
 AttackBar       : LongInt;
 WaterColorArray : array[0..7] of HwColor4f;
 SDWaterColorArray : array[0..7] of HwColor4f;
+ClanColorArray : array[0..Pred(cClanColors)] of Longword;
 TargetCursorPoint     : TPoint;
 CursorPoint           : TPoint;
+CursorPointDelta      : TPoint;
 TargetPoint           : TPoint;
 ScreenFade      : TScreenFade;
 ScreenFadeValue : LongInt;
 ScreenFadeSpeed : LongInt;
 // for EndTurn Lua call
 LuaEndTurnRequested: boolean;
 LuaNoEndTurnTaunts: boolean;
+// whether Lua requested to pause the clock
+LuaClockPaused: boolean;
+// whether /lua command was used
+LuaCmdUsed: boolean;
 MaskedSounds : array[TSound] of boolean;
 LastVoice : TVoice;
 mobileRecord: TMobileRecord;
 /////////////////////////////////////
 //Buttons
 {$IFDEF USE_TOUCH_INTERFACE}
 buttonScale: GLFloat;
+bounceButtonPressed: boolean;
 arrowUp, arrowDown, arrowLeft, arrowRight : TOnScreenWidget;
 firebutton, jumpWidget, AMWidget          : TOnScreenWidget;
 pauseButton, utilityWidget                : TOnScreenWidget;
+utilityWidget2                            : TOnScreenWidget;
 {$ENDIF}
 var
 // these consts are here because they would cause circular dependencies in uConsts/uTypes
 cPathzInit: array[TPathType] of shortstring = (
 '',                              // ptNone
 '//',                            // ptData
 '/Graphics',                     // ptGraphics
 '/Themes',                       // ptThemes
-'/Themes/Bamboo',                // ptCurrTheme
+'/Themes/Nature',                // ptCurrTheme
 '/Config',                       // ptConfig
 '/Config/Teams',                 // ptTeams
 '/Maps',                         // ptMaps
 '',                              // ptMapCurrent
 '/Demos',                        // ptDemos
 '/Graphics/Hats',                // ptHats
 '/Graphics/Flags',               // ptFlags
 '/Missions/Maps',                // ptMissionMaps
 '/Graphics/SuddenDeath',         // ptSuddenDeath
 '/Graphics/Buttons',             // ptButton
-'/Shaders'                       // ptShaders
+'/Shaders',                      // ptShaders
+'/Sounds/voices/Default',        // ptDefaultVoice
+'/misc'                          // ptMisc
 );
 var
 Fontz: array[THWFont] of THHFont;
 Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprSwitch
 (FileName:  'Parachute'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  48; Height: 48; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprParachute
 (FileName:     'Target'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprTarget
-(FileName:   'RopeNode'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+(FileName:   'RopeNode'; Path: ptCurrTheme; AltPath: ptGraphics; Texture: nil; Surface: nil;
-Width:   6; Height:  6; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHighest; getDimensions: false; getImageDimensions: true),// sprRopeNode
+Width:   16; Height:  16; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHighest; getDimensions: false; getImageDimensions: true),// sprRopeNode
 (FileName:   'thinking'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpLowest; getDimensions: false; getImageDimensions: true),// sprQuestion
 (FileName:   'PowerBar'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 256; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprPowerBar
 (FileName:    'WindBar'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 128; Height: 128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHigh; getDimensions: false; getImageDimensions: true), // sprTimerButton
 (FileName: 'targetbutton'; Path: ptButtons; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 128; Height: 128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHigh; getDimensions: false; getImageDimensions: true), // sprTargetButton
 (FileName: 'switchbutton'; Path: ptButtons; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 128; Height: 128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHigh; getDimensions: false; getImageDimensions: true), // sprSwitchButton
+(FileName: 'bouncebutton'; Path: ptButtons; AltPath: ptNone; Texture: nil; Surface: nil;
+Width: 128; Height: 128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHigh; getDimensions: false; getImageDimensions: true), // sprBounceButton
 {$ENDIF}
 (FileName:      'Flake'; Path:ptCurrTheme; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHighest; getDimensions: false; getImageDimensions: true),// sprFlake
 (FileName:     'amRope'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprHandRope
 (FileName:  'slider'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 3; Height: 17; imageWidth: 3; imageHeight: 17; saveSurf: false; critical: true; checkSum: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprSlider
 (FileName:  'botlevels'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 22; Height: 15; imageWidth: 22; imageHeight: 15; saveSurf: true; critical: true; checkSum: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprBotlevels
 (FileName:  'amCleaver'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
-Width:  64; Height: 64; imageWidth: 64; imageHeight: 64; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: false),// sprHandKnife
+Width:  128; Height: 128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprHandKnife
 (FileName:  'cleaver'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 64; Height: 64; imageWidth: 64; imageHeight: 128; saveSurf: false; critical: true; checkSum: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprKnife
 (FileName:  'star'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width: 12; Height: 12; imageWidth: 12; imageHeight: 12; saveSurf: false; critical: true; checkSum: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprStar
 (FileName:  'icetexture'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:   0; Height:  0; imageWidth: 0; imageHeight: 0; saveSurf: true; critical: true; checkSum: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom6
 (FileName:       'custom7'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
 Width:   0; Height:  0; imageWidth: 0; imageHeight: 0; saveSurf: true; critical: true; checkSum: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom7
 (FileName:       'custom8'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
 Width:   0; Height:  0; imageWidth: 0; imageHeight: 0; saveSurf: true; critical: true; checkSum: true; priority: tpLow; getDimensions: true; getImageDimensions: true), // sprCustom8
+(FileName:      'FrozenAirMine'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  32; Height: 32; imageWidth: 32; imageHeight: 32; saveSurf: true; critical: true; checkSum: true; priority: tpHighest; getDimensions: false; getImageDimensions: true), // sprFrozenAirMine
 (FileName:      'AirMine'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpHighest; getDimensions: false; getImageDimensions: true), // sprAirMine
 (FileName:  'amAirMine'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprHandAirMine
 (FileName:      'FlakeL'; Path:ptCurrTheme; AltPath: ptNone; Texture: nil; Surface: nil;
 Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: false; checkSum: false; priority: tpHighest; getDimensions: false; getImageDimensions: true),// sprSDFlakeL
 (FileName:     'CloudsL'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
 Width: 256; Height:128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: false; checkSum: false; priority: tpHigh; getDimensions: false; getImageDimensions: true),// sprCloudL
 (FileName:     'SDCloudsL'; Path: ptCurrTheme;AltPath: ptGraphics; Texture: nil; Surface: nil;
 Width: 256; Height:128; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: false; checkSum: false; priority: tpHigh; getDimensions: false; getImageDimensions: true),// sprSDCloudL
+// TODO: Rename creeper image
 (FileName:     'Duck'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
-Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprDuck
+Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprCreeper
+// TODO: Rename creeper hand image
 (FileName:    'amDuck'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
-Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprHandDuck
+Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprHandCreeper
 (FileName: 'amMinigun'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
-Width:  64; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true) // sprMinigun
+Width:  64; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprMinigun
+(FileName:  'sliderInverted'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width: 3; Height: 17; imageWidth: 3; imageHeight: 17; saveSurf: false; critical: true; checkSum: false; priority: tpLow; getDimensions: false; getImageDimensions: false), // sprSliderInverted
+(FileName:     'FingerBack'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  32; Height: 48; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprFingerBack
+(FileName:     'FingerBackInv'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  32; Height: 48; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprFingerBackInv
+(FileName:    'TargetpBack'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprTargetPBack
+(FileName:    'TargetpBackInv'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprTargetPBackInv
+(FileName:    'HealthHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  18; Height: 18; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprHealthHud
+(FileName:    'HealthPoisonHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  18; Height: 18; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprHealthPoisonHud
+(FileName:    'VampHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  24; Height: 18; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprVampHUD
+(FileName:    'KarmaHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  18; Height: 18; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprKarmaHUD
+(FileName:    'MedicHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  18; Height: 18; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprMedicHud
+(FileName:    'MedicPoisonHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  18; Height: 18; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprMedicPoisonHud
+(FileName:    'HaloHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  22; Height: 11; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprHaloHUD
+(FileName:    'InvulnHUD'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  18; Height: 18; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprInvulnHUD
+(FileName: 'amPiano'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  42; Height: 42; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprAmPiano
+(FileName:  'amLandGun'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  64; Height: 64; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true), // sprHandLandGun
+(FileName: 'amShoryuken'; Path: ptHedgehog; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  32; Height: 32; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true),// sprFirePunch
+(FileName: 'throughWrap'; Path: ptGraphics; AltPath: ptNone; Texture: nil; Surface: nil;
+Width:  16; Height: 13; imageWidth: 0; imageHeight: 0; saveSurf: false; critical: true; checkSum: false; priority: tpMedium; getDimensions: false; getImageDimensions: true) // sprTroughWrap
 );
 const
 Wavez: array [TWave] of record
 Sprite: TSprite;
 FramesCount: Longword;
 SkipTurns: LongWord;
 PosCount: Longword;
 PosSprite: TSprite;
 ejectX, ejectY: Longint;
 end;
+TAmmoCounts = array[TAmmoType] of Longword;
 var
 Ammoz: array [TAmmoType] of TAmmozRec;
+InitialAmmoCounts: TAmmoCounts;
 const
 AmmozInit: array [TAmmoType] of TAmmozRec = (
 (NameId: sidNothing;
 NameTex: nil;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amNothing;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: cHiddenSlotIndex;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
-SkipTurns: 9999;
+SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Grenade
 NumPerTurn: 0;
 Timer: 3000;
 Pos: 0;
 AmmoType: amGrenade;
 AttackVoice: sndCover;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 1;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // ClusterBomb
 NumPerTurn: 0;
 Timer: 3000;
 Pos: 0;
 AmmoType: amClusterBomb;
 AttackVoice: sndCover;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 1;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Bazooka
 Count: AMMO_INFINITE;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amBazooka;
-AttackVoice: sndNone;
+AttackVoice: sndFire;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 0;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //20;
 ejectY: -6),
 // Bee
 Probability: 100;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_Power or
 ammoprop_NeedTarget or
 ammoprop_NoTargetAfter or
+ammoprop_NoWrapTarget or
 ammoprop_DontHold or
+ammoprop_AltUse or
 ammoprop_NeedUpDown;
 Count: 2;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amBee;
-AttackVoice: sndNone;
+AttackVoice: sndFire;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 0;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 NumPerTurn: 1;
 Timer: 0;
 Pos: 0;
 AmmoType: amShotgun;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 2;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //26;
 ejectY: -6),
 // PickHammer
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amPickHammer;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 6;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Skip
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amSkip;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 9;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Rope
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amRope;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 7;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: cMaxAngle div 2;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Mine
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amMine;
 AttackVoice: sndLaugh;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 4;
 TimeAfterTurn: 5000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // DEagle
 NumPerTurn: 3;
 Timer: 0;
 Pos: 0;
 AmmoType: amDEagle;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 2;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //23;
 ejectY: -6),
 // Dynamite
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amDynamite;
 AttackVoice: sndLaugh;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 4;
 TimeAfterTurn: 5000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // FirePunch
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amFirePunch;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 3;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Whip
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amWhip;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 3;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // BaseballBat
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amBaseballBat;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 3;
 TimeAfterTurn: 5000;
 minAngle: 0;
 maxAngle: cMaxAngle div 2;
 isDamaging: true;
 SkipTurns: 2;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Parachute
 ammoprop_AttackInMove or
 ammoprop_NoCrosshair or
 ammoprop_DontHold or
 ammoprop_Utility or
 ammoprop_AltAttack or
+ammoprop_ShowSelIcon or
 ammoprop_NeedUpDown;
 Count: 2;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amParachute;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 7;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // AirAttack
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amAirAttack;
-AttackVoice: sndIncoming;
+AttackVoice: sndNone; // handled in doStepAirAttack
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 5;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amMineStrike;
-AttackVoice: sndIncoming;
+AttackVoice: sndNone; // handled in doStepAirAttack
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 5;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amBlowTorch;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 6;
 TimeAfterTurn: 3000;
 minAngle: 804;
 maxAngle: 1327;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Girder
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amGirder;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 6;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_ForwMsgs or
 ammoprop_NoCrosshair or
 ammoprop_NeedTarget or
 ammoprop_AttackingPut or
+ammoprop_AttackInMove or
 ammoprop_Utility or
 ammoprop_DontHold;
 Count: 2;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amTeleport;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 7;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoRoundEnd or
 ammoprop_ForwMsgs or
 ammoprop_NoCrosshair or
 ammoprop_Utility or
+ammoprop_ShowSelIcon or
 ammoprop_DontHold;
 Count: 3;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amSwitch;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 9;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Mortar
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amMortar;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 0;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //20;
 ejectY: -6),
 // Kamikaze
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amKamikaze;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 3;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Cake
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amCake;
 AttackVoice: sndLaugh;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 4;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 4;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Seduction
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amSeduction;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 3;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Watermelon
 NumPerTurn: 0;
 Timer: 3000;
 Pos: 0;
 AmmoType: amWatermelon;
 AttackVoice: sndMelon;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 1;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // HellishBomb ("Hellish Hand-Grenade")
 Count: 0;
 NumPerTurn: 0;
 Timer: 5000;
 Pos: 0;
 AmmoType: amHellishBomb;
-AttackVoice: sndNone;
+AttackVoice: sndWatchThis;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 1;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Napalm
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amNapalm;
-AttackVoice: sndIncoming;
+AttackVoice: sndNone; // handled in doStepAirAttack
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 5;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 Count: AMMO_INFINITE;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amDrill;
-AttackVoice: sndNone;
+AttackVoice: sndFire;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 0;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprDrill;
 ejectX: 0; //20;
 ejectY: -6),
 // Ballgun
 NumPerTurn: 0;
 Timer: 5001;
 Pos: 0;
 AmmoType: amBallgun;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 4;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //20;
 ejectY: -3),
 // RC-Plane
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amRCPlane;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 4;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 4;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // LowGravity
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoRoundEnd or
 ammoprop_NoCrosshair or
 ammoprop_DontHold or
 ammoprop_AltUse or
+ammoprop_ShowSelIcon or
 ammoprop_Utility or
 ammoprop_Effect;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amLowGravity;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 9;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // ExtraDamage
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoRoundEnd or
 ammoprop_NoCrosshair or
 ammoprop_DontHold or
 ammoprop_AltUse or
+ammoprop_ShowSelIcon or
 ammoprop_Utility or
 ammoprop_Effect;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amExtraDamage;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 9;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Invulnerable
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoRoundEnd or
 ammoprop_NoCrosshair or
 ammoprop_DontHold or
 ammoprop_AltUse or
+ammoprop_ShowSelIcon or
 ammoprop_Utility or
 ammoprop_Effect;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amInvulnerable;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 8;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // ExtraTime
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoRoundEnd or
 ammoprop_NoCrosshair or
 ammoprop_DontHold or
 ammoprop_AltUse or
+ammoprop_ShowSelIcon or
 ammoprop_Utility or
 ammoprop_Effect;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amExtraTime;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 9;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // LaserSight
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoRoundEnd or
 ammoprop_NoCrosshair or
 ammoprop_DontHold or
 ammoprop_AltUse or
+ammoprop_ShowSelIcon or
 ammoprop_Utility or
 ammoprop_NeedUpDown or
 ammoprop_Effect;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amLaserSight;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 8;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Vampiric
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amVampiric;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 8;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // SniperRifle
 NumPerTurn: 1;
 Timer: 0;
 Pos: 0;
 AmmoType: amSniperRifle;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 2;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //40;
 ejectY: -5),
 // Jetpack ("Flying Saucer")
 ammoprop_ForwMsgs or
 ammoprop_AttackInMove or
 ammoprop_DontHold or
 ammoprop_Utility or
 ammoprop_NeedUpDown or
+ammoprop_ShowSelIcon or
 ammoprop_AltAttack;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amJetpack;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 7;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Molotov
 Count: AMMO_INFINITE;
 NumPerTurn: 0;
 Timer: 3000;
 Pos: 0;
 AmmoType: amMolotov;
-AttackVoice: sndNone;
+AttackVoice: sndWatchThis;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 1;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Birdy
 Probability: 20;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_ForwMsgs or
 ammoprop_NoCrosshair or
 ammoprop_NeedUpDown or
+ammoprop_ShowSelIcon or
 ammoprop_DontHold;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amBirdy;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 7;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // PortalGun
 NumPerTurn: 3;
 Timer: 0;
 Pos: 0;
 AmmoType: amPortalGun;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 7;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: -5; //29;
 ejectY: -7),
 // Piano
 NameTex: nil;
 Probability: 100;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoCrosshair or
 ammoprop_NeedTarget or
-ammoprop_NoTargetAfter or
+// NoTargetAfter is handled manually in doStepPiano
 ammoprop_AttackingPut or
 ammoprop_DontHold or
 ammoprop_NotBorder or
 ammoprop_ForceTurnEnd;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amPiano;
-AttackVoice: sndIncoming;
+AttackVoice: sndNone; // handled in doStepPiano
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 5;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 7;
 PosCount: 1;
-PosSprite: sprWater;
+PosSprite: sprAmPiano;
 ejectX: 0;
 ejectY: 0),
 // GasBomb
 (NameId: sidGasBomb;
 NumPerTurn: 0;
 Timer: 3000;
 Pos: 0;
 AmmoType: amGasBomb;
 AttackVoice: sndCover;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 1;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // SineGun
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amSineGun;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 2;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Flamethrower
 NumPerTurn: 0;
 Timer: 5001;
 Pos: 0;
 AmmoType: amFlamethrower;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
-Slot: 2;
+Slot: 6;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //20;
 ejectY: -3),
 // Sticky Mine
 NumPerTurn: 1;
 Timer: 0;
 Pos: 0;
 AmmoType: amSMine;
 AttackVoice: sndLaugh;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 4;
 TimeAfterTurn: 5000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Hammer
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amHammer;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 3;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Resurrector
 NameTex: nil;
 Probability: 0;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoCrosshair or
 ammoprop_Utility or
-ammoprop_NoRoundEnd;
+ammoprop_NoRoundEnd or
+ammoprop_DoesntStopTimerWhileAttacking;
 Count: 1;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amResurrector;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 8;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // DrillStrike
 Count: 1;
 NumPerTurn: 0;
 Timer: 5000;
 Pos: 0;
 AmmoType: amDrillStrike;
-AttackVoice: sndIncoming;
+AttackVoice: sndNone; // handled in doStepAirAttack
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 5;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amSnowball;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 0;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Tardis
 Probability: 200;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_ForwMsgs or
 ammoprop_NoCrosshair or
 ammoprop_Utility or
+ammoprop_ShowSelIcon or
 ammoprop_DontHold or
 ammoprop_ForceTurnEnd;
 Count: 2;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amTardis;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 8;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
 PosCount: 2;
 PosSprite: sprAmTeleport;
 ejectX: 0;
 ejectY: 0),
-// Structure
-{
-(NameId: sidStructure;
-NameTex: nil;
-Probability: 0;
-NumberInCase: 1;
-Ammo: (Propz: ammoprop_ForwMsgs or
-ammoprop_NoCrosshair or
-ammoprop_Utility or
-ammoprop_DontHold;
-Count: 1;
-NumPerTurn: 0;
-Timer: 0;
-Pos: 0;
-AmmoType: amStructure;
-AttackVoice: sndNone;
-Bounciness: 1000);
-Slot: 6;
-TimeAfterTurn: 0;
-minAngle: 0;
-maxAngle: 0;
-isDamaging: false;
-SkipTurns: 0;
-PosCount: 1;
-PosSprite: sprWater;
-ejectX: 0;
-ejectY: 0),
-}
 // Land Gun
 (NameId: sidLandGun;
 NameTex: nil;
 Probability: 20;
 NumPerTurn: 0;
 Timer: 5001;
 Pos: 0;
 AmmoType: amLandGun;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 6;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //20;
 ejectY: -3),
 // Freezer
 (NameId: sidIceGun;
 NumPerTurn: 0;
 Timer: 5001;
 Pos: 0;
 AmmoType: amIceGun;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 2;
 TimeAfterTurn: 0;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //20;
 ejectY: -3),
 // Knife
 (NameId: sidKnife;
 Count: 1;
 NumPerTurn: 1;
 Timer: 0;
 Pos: 0;
 AmmoType: amKnife;
-AttackVoice: sndNone;
+AttackVoice: sndWatchThis;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
-Slot: 6;
+Slot: 0;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
 // Rubber
 (NameId: sidRubber;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amRubber;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 6;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: false;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amAirMine;
 AttackVoice: sndLaugh;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 5;
 TimeAfterTurn: 5000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0;
 ejectY: 0),
-// Rubber duck
+// Creeper
-(NameId: sidDuck;
+(NameId: sidCreeper;
 NameTex: nil;
 Probability: 100;
 NumberInCase: 1;
 Ammo: (Propz: ammoprop_NoCrosshair or
 ammoprop_AttackInMove or
 ammoprop_AltUse;
 Count: 2;
 NumPerTurn: 0;
 Timer: 15000;
 Pos: 0;
-AmmoType: amDuck;
+AmmoType: amCreeper;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
-Slot: 0;
+// Slot chosen to prevent ammo column overflow
+// TODO: Change slot when creeper is finished
+Slot: 8;
 TimeAfterTurn: 3000;
 minAngle: 0;
 maxAngle: 0;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 15;
 ejectY: -7),
 // Minigun
 (NameId: sidMinigun;
 NumPerTurn: 0;
 Timer: 0;
 Pos: 0;
 AmmoType: amMinigun;
 AttackVoice: sndNone;
-Bounciness: 1000);
+Bounciness: defaultBounciness);
 Slot: 2;
 TimeAfterTurn: 3000;
 minAngle: cMaxAngle div 6;
 maxAngle: 5 * cMaxAngle div 6;
 isDamaging: true;
 SkipTurns: 0;
-PosCount: 1;
+PosCount: 0;
 PosSprite: sprWater;
 ejectX: 0; //23;
 ejectY: 0) //-6;
 );
 Land: TCollisionArray;
 LandPixels: TLandArray;
 LandDirty: TDirtyTag;
 hasBorder: boolean;
 hasGirders: boolean;
-playHeight, playWidth, leftX, rightX, topY, MaxHedgehogs: Longword;  // idea is that a template can specify height/width.  Or, a map, a height/width by the dimensions of the image.  If the map has pixels near top of image, it triggers border.
+playHeight, playWidth, leftX, rightX, topY: LongInt;  // idea is that a template can specify height/width.  Or, a map, a height/width by the dimensions of the image.  If the map has pixels near top of image, it triggers border.
+	MaxHedgehogs: LongWord;
 LandBackSurface: PSDL_Surface;
 CurAmmoGear: PGear;
 lastGearByUID: PGear;
 GearsList: PGear;
 AllInactive: boolean;
 SuddenDeathActive: Boolean; // Is in Sudden Death with any gameplay effect
 SuddenDeathDmg: Boolean; // Is in Sudden Death with damage
 SpeechType: Longword;
 SpeechText: shortstring;
 PlacingHogs: boolean; // a convenience flag to indicate placement of hogs is still in progress
+PlacingKings: boolean; // a convenience flag to indicate placement of kings in King Mode is still in progress
 StepSoundTimer: LongInt;
 StepSoundChannel: LongInt;
 CurrentTeam: PTeam;
 PreviousTeam: PTeam;
+MissionTeam: PTeam;
 CurrentHedgehog: PHedgehog;
 TeamsArray: array[0..Pred(cMaxTeams)] of PTeam;
 TeamsCount: Longword; // number of teams on game start
 VisibleTeamsCount: Longword; // number of teams visible in team bar
 ClansArray, SpawnClansArray: TClansArray;
 ClansCount: Longword;
-LocalClan: LongInt;  // last non-bot, non-extdriven clan
 LocalTeam: LongInt;  // last non-bot, non-extdriven clan first team
 LocalAmmo: LongInt;  // last non-bot, non-extdriven clan's first team's ammo index, updated to next upcoming hog for per-hog-ammo
 CurMinAngle, CurMaxAngle: Longword;
 FollowGear: PGear;
 aVertex: GLint;
 aTexCoord: GLint;
 aColor: GLint;
+lDecimalSeparator: Char;
 var trammo:  array[TAmmoStrId] of ansistring;   // name of the weapon
 trammoc: array[TAmmoStrId] of ansistring;   // caption of the weapon
 trammod: array[TAmmoStrId] of ansistring;   // description of the weapon
 trluaammo: array[TAmmoStrId] of ansistring; // name of the weapon (Lua overwrite)
 trluaammoc: array[TAmmoStrId] of ansistring; // caption of the weapon (Lua overwrite)
 trluaammod: array[TAmmoStrId] of ansistring;  // description of the weapon (Lua overwrite)
 trluaammoa: array[TAmmoStrId] of ansistring; // description appendix of the weapon (Lua only)
+trluaammoe: array[TAmmoStrId] of boolean;   // whether to render extra text (Lua overwrite)
 trmsg:   array[TMsgStrId]  of ansistring;   // message of the event
 trgoal:  array[TGoalStrId] of ansistring;   // message of the goal
+trcmd:   array[TCmdHelpStrId] of ansistring; // chat command help
 cTestLua : Boolean;
 procedure preInitModule;
 procedure initModule;
 procedure freeModule;
 cScreenWidth      := cWindowedWidth;
 cScreenHeight     := cWindowedHeight;
 cShowFPS        := false;
 cAltDamage      := false;
+cHolidaySilliness := true;
 cTimerInterval  := 8;
 cReducedQuality := rqNone;
-cLocaleFName    := 'en.txt';
+cLanguageFName  := 'en.txt';
 cFullScreen     := false;
 UserPathPrefix  := '';
 ipcPort         := 0;
 recordFileName  := '';
 cOnlyStats      := False;
 cScriptName     := '';
 cScriptParam    := '';
 cTestLua        := False;
+UserZoom        := cDefaultZoomLevel;
+zoom            := cDefaultZoomLevel;
+ZoomValue       := cDefaultZoomLevel;
+{$IFDEF MOBILE}
+cMaxZoomLevel   := 0.5;
+cMinZoomLevel   := 3.5;
+cZoomDelta      := 0.20;
+cZoomDeltaSmall := 0.10;
+{$ELSE}
+cMaxZoomLevel   := 1.0;
+cMinZoomLevel   := 3.0;
+cZoomDelta      := 0.25;
+cZoomDeltaSmall := 0.125;
+{$ENDIF}
 {$IFDEF USE_VIDEO_RECORDING}
 RecPrefix          := '';
 cAVFormat          := '';
 cVideoCodec        := '';
 cVideoFramerateNum := 0;
 procedure initModule;
 var s: shortstring;
 i: integer;
 t: TSound;
+a: TAmmoStrId;
 begin
 // init LastVoice
 LastVoice.snd:= sndNone;
 LastVoice.voicepack:= nil;
 Move(FontzInit, Fontz, sizeof(Fontz));
 Move(SpritesDataInit, SpritesData, sizeof(SpritesData));
 Move(AmmozInit, Ammoz, sizeof(Ammoz));
-cLocale:= cLocaleFName;
+cLanguage:= cLanguageFName;
-SplitByChar(cLocale, s, '.');
+SplitByChar(cLanguage, s, '.');
 cFlattenFlakes      := false;
 cFlattenClouds      := false;
 cIce                := false;
 cSnow               := false;
 WaterColorArray[5]:= WaterColorArray[1];
 WaterColorArray[7]:= WaterColorArray[1];
 WaterOpacity:= $80;
+// default clan colors
+// always keep in sync with QTfrontend/hwconsts.h
+ClanColorArray[0] := $ffff0204;
+ClanColorArray[1] := $ff4980c1;
+ClanColorArray[2] := $ff1de6ba;
+ClanColorArray[3] := $ffb541ef;
+ClanColorArray[4] := $ffe55bb0;
+ClanColorArray[5] := $ff20bf00;
+ClanColorArray[6] := $fffe8b0e;
+ClanColorArray[7] := $ff8f5902;
+ClanColorArray[8] := $ffffff01;
 // default sudden death water
 // deep water
 SDWaterColorArray[0].r := 150;
 SDWaterColorArray[0].g := 112;
 cLowGravity             := false;
 cBuildMaxDist           := cDefaultBuildMaxDist;
 cDamageModifier         := _1;
 TargetPoint             := cTargetPointRef;
-{$IFDEF MOBILE}
-cMaxZoomLevel:= 0.5;
-cMinZoomLevel:= 3.5;
-cZoomDelta:= 0.20;
-{$ELSE}
-cMaxZoomLevel:= 1.0;
-cMinZoomLevel:= 3.0;
-cZoomDelta:= 0.25;
-{$ENDIF}
 aVertex:= 0;
 aTexCoord:= 1;
 aColor:= 2;
+lDecimalSeparator       := '.';
 cMinMaxZoomLevelDelta:= cMaxZoomLevel - cMinZoomLevel;
+cDemoClockFPSOffsetY := 0;
 // int, longint longword and byte
 CursorMovementX     := 0;
 CursorMovementY     := 0;
 GameTicks           := 0;
+OuchTauntTimer      := 0;
 CheckSum            := 0;
 cWaterLine          := LAND_HEIGHT;
 cGearScrEdgesDist   := 240;
 InputMask           := $FFFFFFFF;
 IsGetAwayTime       := false;
 GameOver            := false;
 TurnClockActive     := true;
 TagTurnTimeLeft     := 0;
 cSuddenDTurns       := 15;
+LastSuddenDWarn     := -2;
+cInitHealth         := 100;
 cDamagePercent      := 100;
 cRopePercent        := 100;
+cRopeNodeStep       := 4;
+cRopeLayers         := 1;
 cGetAwayTime        := 100;
 cMineDudPercent     := 0;
 cTemplateFilter     := 0;
-cFeatureSize        := 50;
+cFeatureSize        := 12;
 cMapGen             := mgRandom;
 cHedgehogTurnTime   := 45000;
 cMinesTime          := 3000;
 cMaxAIThinkTime     := 9000;
 cCloudsNumber       := 9;
 InitStepsFlags  := 0;
 RealTicks       := 0;
 AttackBar       := 0; // 0 - none, 1 - just bar at the right-down corner, 2 - from weapon
 cCaseFactor     := 5;  {0..9}
+cMaxCaseDrops   := 5;
 cLandMines      := 4;
 cAirMines       := 0;
 cExplosives     := 2;
 GameState       := Low(TGameState);
 cVampiric       := false;
 flagMakeCapture := false;
 flagDumpLand    := false;
 bBetweenTurns   := false;
 bWaterRising    := false;
+bDuringWaterRise:= false;
 isCursorVisible := false;
 isInLag         := false;
 isPaused        := false;
 isInMultiShoot  := false;
 isSpeed         := false;
 isAFK           := false;
+isShowMission   := false;
+isShowGearInfo  := false;
+isForceMission  := false;
 SpeedStart      := 0;
 fastUntilLag    := false;
 fastScrolling   := false;
 autoCameraOn    := true;
 cSeed           := '';
+cIsSoundEnabled := false;
 cVolumeDelta    := 0;
+cVolumeUpKey    := false;
+cVolumeDownKey  := false;
 cMuteToggle     := false;
 cHasFocus       := true;
 cInactDelay     := 100;
 ReadyTimeLeft   := 0;
 LuaTemplateNumber:= 0;
 LuaEndTurnRequested:= false;
 LuaNoEndTurnTaunts:= false;
+LuaCmdUsed:= false;
 for t:= Low(TSound) to High(TSound) do
 MaskedSounds[t]:= false;
+for a:= Low(TAmmoStrId) to High(TAmmoStrId) do
+trluaammoe[a]:= true;
 UIDisplay:= uiAll;
 LocalMessage:= 0;
 cStereoDepth:= 0;
 CurAmmoGear:= nil;
 lastGearByUID:= nil;
 GearsList:= nil;
 CurrentTeam:= nil;
 PreviousTeam:= nil;
+MissionTeam:= nil;
 CurrentHedgehog:= nil;
 FollowGear:= nil;
 lastVisualGearByUID:= nil;
 ChefHatTexture:= nil;

branch	ui-scaling
changeset 15283	c4fd2813b127
parent 13389	24b531dcebe7
parent 15267	22f2fd8a3d2c
child 15663	d92eeb468dad