hedgewars: comparison hedgewars/uScript.pas

equal deleted inserted replaced

-:8054d9d775fd
+:2759212a27de
 uDebug,
 uCollisions,
 uRenderUtils,
 uTextures,
 uLandGraphics,
-SDLh,
 SysUtils,
 uIO,
 uVisualGearsList,
 uGearsHandlersMess,
 uPhysFSLayer,
 ScriptAmmoLoadout : shortstring;
 ScriptAmmoProbability : shortstring;
 ScriptAmmoDelay : shortstring;
 ScriptAmmoReinforcement : shortstring;
 ScriptLoaded : boolean;
+mapDims : boolean;
 procedure ScriptPrepareAmmoStore; forward;
 procedure ScriptApplyAmmoStore; forward;
-procedure ScriptSetAmmo(ammo : TAmmoType; count, propability, delay, reinforcement: Byte); forward;
+procedure ScriptSetAmmo(ammo : TAmmoType; count, probability, delay, reinforcement: Byte); forward;
+procedure ScriptSetAmmoDelay(ammo : TAmmoType; delay: Byte); forward;
 procedure LuaError(s: shortstring);
 begin
 WriteLnToConsole(s);
 AddChatString(#5 + s);
+end;
+procedure LuaParameterCountError(call, paramsyntax: shortstring; wrongcount: LongInt);
+begin
+// TODO: i18n?
+LuaError('Lua: Wrong number of parameters (' + inttostr(wrongcount) + ') passed to ' + call + '!     syntax: ' + call + ' ( ' + paramsyntax + ' )');
 end;
 // wrapped calls //
 // functions called from Lua:
 function lc_band(L: PLua_State): LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to band!');
+LuaParameterCountError('band', 'value1, value2', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 lua_pushinteger(L, lua_tointeger(L, 2) and lua_tointeger(L, 1));
 lc_band := 1;
 function lc_bor(L: PLua_State): LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to bor!');
+LuaParameterCountError('bor', 'value1, value2', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 lua_pushinteger(L, lua_tointeger(L, 2) or lua_tointeger(L, 1));
 lc_bor := 1;
 function lc_bnot(L: PLua_State): LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to bnot!');
+LuaParameterCountError('bnot', 'value', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 lua_pushinteger(L, (not lua_tointeger(L, 1)));
 lc_bnot := 1;
 function lc_div(L: PLua_State): LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to div!');
+LuaParameterCountError('div', 'dividend, divisor', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 lua_pushinteger(L, lua_tointeger(L, 1) div lua_tointeger(L, 2));
 lc_div := 1;
 end;
 function lc_getinputmask(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 0 then
-LuaError('Lua: Wrong number of parameters passed to GetInputMask!')
+LuaParameterCountError('GetInputMask', '', lua_gettop(L))
 else
 lua_pushinteger(L, InputMask);
 lc_getinputmask:= 1
 end;
 function lc_setinputmask(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to SetInputMask!')
+LuaParameterCountError('SetInputMask', 'mask', lua_gettop(L))
 else
 InputMask:= lua_tointeger(L, 1);
 lc_setinputmask:= 0
 end;
 if lua_gettop(L) = 1 then
 begin
 WriteLnToConsole('Lua: ' + lua_tostring(L ,1));
 end
 else
-LuaError('Lua: Wrong number of parameters passed to WriteLnToConsole!');
+LuaParameterCountError('WriteLnToConsole', 'string', lua_gettop(L));
 lc_writelntoconsole:= 0;
 end;
 function lc_parsecommand(L : Plua_State) : LongInt; Cdecl;
 var t: PChar;
 ParseCommand(s, true, true);
 end
 else
-LuaError('Lua: Wrong number of parameters passed to ParseCommand!');
+LuaParameterCountError('ParseCommand', 'string', lua_gettop(L));
 lc_parsecommand:= 0;
 end;
 function lc_showmission(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) = 5 then
 begin
 ShowMission(lua_tostring(L, 1), lua_tostring(L, 2), lua_tostring(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
 end
 else
-LuaError('Lua: Wrong number of parameters passed to ShowMission!');
+LuaParameterCountError('ShowMission', 'caption, subcaption, text, icon, time', lua_gettop(L));
 lc_showmission:= 0;
 end;
 function lc_hidemission(L : Plua_State) : LongInt; Cdecl;
 begin
 else if lua_gettop(L) = 3 then
 begin
 AddCaption(lua_tostring(L, 1), lua_tointeger(L, 2) shr 8, TCapGroup(lua_tointeger(L, 3)));
 end
 else
-LuaError('Lua: Wrong number of parameters passed to AddCaption!');
+LuaParameterCountError('AddCaption', 'text[, color, captiongroup]', lua_gettop(L));
 lc_addcaption:= 0;
 end;
 function lc_campaignlock(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) = 1 then
 begin
 // to be done
 end
 else
-LuaError('Lua: Wrong number of parameters passed to CampaignLock!');
+LuaParameterCountError('CampaignLock', 'TODO', lua_gettop(L));
 lc_campaignlock:= 0;
 end;
 function lc_campaignunlock(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) = 1 then
 begin
 // to be done
 end
 else
-LuaError('Lua: Wrong number of parameters passed to CampaignUnlock!');
+LuaParameterCountError('CampaignUnlock', 'TODO', lua_gettop(L));
 lc_campaignunlock:= 0;
 end;
 function lc_spawnfakehealthcrate(L: Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 4 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SpawnFakeHealthCrate!');
+LuaParameterCountError('SpawnFakeHealthCrate', 'x, y, explode, poison', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 begin
 gear := SpawnFakeCrateAt(lua_tointeger(L, 1), lua_tointeger(L, 2),
 function lc_spawnfakeammocrate(L: PLua_State): LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 4 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SpawnFakeAmmoCrate!');
+LuaParameterCountError('SpawnFakeAmmoCrate', 'x, y, explode, poison', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 begin
 gear := SpawnFakeCrateAt(lua_tointeger(L, 1), lua_tointeger(L, 2),
 function lc_spawnfakeutilitycrate(L: PLua_State): LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 4 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SpawnFakeUtilityCrate!');
+LuaParameterCountError('SpawnFakeUtilityCrate', 'x, y, explode, poison', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 begin
 gear := SpawnFakeCrateAt(lua_tointeger(L, 1), lua_tointeger(L, 2),
 var gear: PGear;
 var health: LongInt;
 begin
 if (lua_gettop(L) < 2) or (lua_gettop(L) > 3) then
 begin
-LuaError('Lua: Wrong number of parameters passed to SpawnHealthCrate!');
+LuaParameterCountError('SpawnHealthCrate', 'x, y[, health]', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 begin
 if lua_gettop(L) = 3 then
 function lc_spawnammocrate(L: PLua_State): LongInt; Cdecl;
 var gear: PGear;
 begin
 if (lua_gettop(L) <> 3) and (lua_gettop(L) <> 4) then
 begin
-LuaError('Lua: Wrong number of parameters passed to SpawnAmmoCrate!');
+LuaParameterCountError('SpawnAmmoCrate', 'x, y, content[, amount]', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 begin
 if (lua_gettop(L) = 3) then
 function lc_spawnutilitycrate(L: PLua_State): LongInt; Cdecl;
 var gear: PGear;
 begin
 if (lua_gettop(L) <> 3) and (lua_gettop(L) <> 4) then
 begin
-LuaError('Lua: Wrong number of parameters passed to SpawnUtilityCrate!');
+LuaParameterCountError('SpawnUtilityCrate', 'x, y, content[, amount]', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 begin
 if (lua_gettop(L) = 3) then
 dx, dy: hwFloat;
 gt: TGearType;
 begin
 if lua_gettop(L) <> 7 then
 begin
-LuaError('Lua: Wrong number of parameters passed to AddGear!');
+LuaParameterCountError('AddGear', 'x, y, gearType, state, dx, dy, timer', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 x:= lua_tointeger(L, 1);
 function lc_deletegear(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to DeleteGear!');
+LuaParameterCountError('DeleteGear', 'gearUid', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 c: Boolean;
 vgt: TVisualGearType;
 begin
 if lua_gettop(L) <> 5 then
 begin
-LuaError('Lua: Wrong number of parameters passed to AddVisualGear!');
+LuaParameterCountError('AddVisualGear', 'x, y, visualGearType, state, critical', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 x:= lua_tointeger(L, 1);
 function lc_deletevisualgear(L : Plua_State) : LongInt; Cdecl;
 var vg : PVisualGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to DeleteVisualGear!');
+LuaParameterCountError('DeleteVisualGear', 'vgUid', lua_gettop(L));
 end
 else
 begin
 vg:= VisualGearByUID(lua_tointeger(L, 1));
 if vg <> nil then
 function lc_getvisualgearvalues(L : Plua_State) : LongInt; Cdecl;
 var vg: PVisualGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetVisualGearValues!');
+LuaParameterCountError('GetVisualGearValues', 'vgUid', lua_gettop(L));
 lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L);
 lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L); lua_pushnil(L)
 end
 else
 begin
 function lc_setvisualgearvalues(L : Plua_State) : LongInt; Cdecl;
 var vg : PVisualGear;
 begin
 if lua_gettop(L) <> 11 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SetVisualGearValues!');
+LuaParameterCountError('SetVisualGearValues', 'vgUid, X, Y, dX, dY, Angle, Frame, FrameTicks, State, Timer, Tint', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 vg:= VisualGearByUID(lua_tointeger(L, 1));
 function lc_getfollowgear(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 0 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetFollowGear!');
+LuaParameterCountError('GetFollowGear', '', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 if FollowGear = nil then
 lua_pushnil(L)
 function lc_getgeartype(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearType!');
+LuaParameterCountError('GetGearType', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_getgearmessage(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearMessage!');
+LuaParameterCountError('GetGearMessage', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_getgearelasticity(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearElasticity!');
+LuaParameterCountError('GetGearElasticity', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_setgearmessage(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
-LuaError('Lua: Wrong number of parameters passed to SetGearMessage!')
+LuaParameterCountError('SetGearMessage', 'gearUid, message', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 gear^.message:= lua_tointeger(L, 2);
 function lc_getgearpos(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearPos!');
+LuaParameterCountError('GetGearPos', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_setgearpos(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
-LuaError('Lua: Wrong number of parameters passed to SetGearPos!')
+LuaParameterCountError('SetGearPos', 'gearUid, value', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 gear^.Pos:= lua_tointeger(L, 2);
 function lc_getgearcollisionmask(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearCollisionMask!');
+LuaParameterCountError('GetGearCollisionMask', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_setgearcollisionmask(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
-LuaError('Lua: Wrong number of parameters passed to SetGearCollisionMask!')
+LuaParameterCountError('SetGearCollisionMask', 'gearUid, mask', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 gear^.CollisionMask:= lua_tointeger(L, 2);
 function lc_gethoglevel(L : Plua_State): LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to GetHogLevel!')
+LuaParameterCountError('GetHogLevel', 'gearUid', lua_gettop(L))
 else
 begin
 gear := GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and ((gear^.Kind = gtHedgehog) or (gear^.Kind = gtGrave)) and (gear^.Hedgehog <> nil) then
 lua_pushinteger(L, gear^.Hedgehog^.BotLevel)
 function lc_sethoglevel(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
-LuaError('Lua: Wrong number of parameters passed to SetHogLevel!')
+LuaParameterCountError('SetHogLevel', 'gearUid, level', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and (gear^.Kind = gtHedgehog) and (gear^.Hedgehog <> nil) then
 gear^.Hedgehog^.BotLevel:= lua_tointeger(L, 2);
 function lc_gethogclan(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetHogClan!');
+LuaParameterCountError('GetHogClan', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_getclancolor(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetClanColor!');
+LuaParameterCountError('GetClanColor', 'clan', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else lua_pushinteger(L, ClansArray[lua_tointeger(L, 1)]^.Color shl 8 or $FF);
 lc_getclancolor:= 1
 end;
 function lc_setclancolor(L : Plua_State) : LongInt; Cdecl;
 var clan : PClan;
 team : PTeam;
 hh   : THedgehog;
 i, j : LongInt;
-r, rr: TSDL_Rect;
-texsurf: PSDL_Surface;
 begin
 if lua_gettop(L) <> 2 then
-LuaError('Lua: Wrong number of parameters passed to SetClanColor!')
+LuaParameterCountError('SetClanColor', 'clan, color', lua_gettop(L))
 else
 begin
 clan := ClansArray[lua_tointeger(L, 1)];
 clan^.Color:= lua_tointeger(L, 2) shr 8;
 for i:= 0 to Pred(clan^.TeamsNumber) do
 begin
 team:= clan^.Teams[i];
 for j:= 0 to 7 do
 begin
 RenderHealth(hh);
 end;
 end;
 FreeTexture(team^.NameTagTex);
 team^.NameTagTex:= RenderStringTex(clan^.Teams[i]^.TeamName, clan^.Color, fnt16);
-r.w:= cTeamHealthWidth + 5;
+end;
-r.h:= team^.NameTagTex^.h;
+clan^.HealthTex:= makeHealthBarTexture(cTeamHealthWidth + 5, clan^.Teams[0]^.NameTagTex^.h, clan^.Color);
-texsurf:= SDL_CreateRGBSurface(SDL_SWSURFACE, r.w, r.h, 32, RMask, GMask, BMask, AMask);
+end;
-TryDo(texsurf <> nil, errmsgCreateSurface, true);
-TryDo(SDL_SetColorKey(texsurf, SDL_SRCCOLORKEY, 0) = 0, errmsgTransparentSet, true);
-DrawRoundRect(@r, cWhiteColor, cNearBlackColor, texsurf, true);
-rr:= r;
-inc(rr.x, 2); dec(rr.w, 4); inc(rr.y, 2); dec(rr.h, 4);
-DrawRoundRect(@rr, clan^.Color, clan^.Color, texsurf, false);
-FreeTexture(team^.HealthTex);
-team^.HealthTex:= Surface2Tex(texsurf, false);
-SDL_FreeSurface(texsurf);
-MakeCrossHairs
-end
-end;
 lc_setclancolor:= 0
 end;
 function lc_gethogteamname(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetHogTeamName!');
+LuaParameterCountError('GetHogTeamName', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 lua_pushnil(L);
 end;
 lc_gethogteamname:= 1
 end;
+function lc_sethogteamname(L : Plua_State) : LongInt; Cdecl;
+var gear : PGear;
+begin
+if lua_gettop(L) <> 2 then
+begin
+LuaParameterCountError('SetHogTeamName', 'gearUid, name', lua_gettop(L));
+lua_pushnil(L); // return value on stack (nil)
+end
+else
+begin
+gear := GearByUID(lua_tointeger(L, 1));
+if (gear <> nil) and ((gear^.Kind = gtHedgehog) or (gear^.Kind = gtGrave)) and (gear^.Hedgehog <> nil) then
+begin
+gear^.Hedgehog^.Team^.TeamName := lua_tostring(L, 2);
+FreeTexture(gear^.Hedgehog^.Team^.NameTagTex);
+gear^.Hedgehog^.Team^.NameTagTex:= RenderStringTex(gear^.Hedgehog^.Team^.TeamName, gear^.Hedgehog^.Team^.Clan^.Color, fnt16);
+end
+else
+lua_pushnil(L);
+end;
+lc_sethogteamname:= 1
+end;
 function lc_gethogname(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetHogName!');
+LuaParameterCountError('GetHogName', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 lc_gethogname:= 1
 end;
 function lc_sethogname(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
-hogName: ShortString;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SetHogName!');
+LuaParameterCountError('SetHogName', 'gearUid, name', lua_gettop(L));
 lua_pushnil(L)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and (gear^.Kind = gtHedgehog) and (gear^.Hedgehog <> nil) then
+begin
-hogName:= lua_tostring(L, 2);
+gear^.Hedgehog^.Name:= lua_tostring(L, 2);
-gear^.Hedgehog^.Name:= hogName;
+FreeTexture(gear^.Hedgehog^.NameTagTex);
-FreeTexture(gear^.Hedgehog^.NameTagTex);
+gear^.Hedgehog^.NameTagTex:= RenderStringTex(gear^.Hedgehog^.Name, gear^.Hedgehog^.Team^.Clan^.Color, fnt16)
-gear^.Hedgehog^.NameTagTex:= RenderStringTex(gear^.Hedgehog^.Name, gear^.Hedgehog^.Team^.Clan^.Color, fnt16);
+end
 end;
 lc_sethogname:= 0;
 end;
 function lc_gettimer(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetTimer!');
+LuaParameterCountError('GetTimer', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_gethealth(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetHealth!');
+LuaParameterCountError('GetHealth', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_getx(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetX!');
+LuaParameterCountError('GetX', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_gety(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetY!');
+LuaParameterCountError('GetY', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_copypv(L : Plua_State) : LongInt; Cdecl;
 var gears, geard : PGear;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to CopyPV!');
+LuaParameterCountError('CopyPV', 'fromGearUid, toGearUid', lua_gettop(L));
 end
 else
 begin
 gears:= GearByUID(lua_tointeger(L, 1));
 geard:= GearByUID(lua_tointeger(L, 2));
 function lc_followgear(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to FollowGear!')
+LuaParameterCountError('FollowGear', 'gearUid', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then FollowGear:= gear
 end;
 vgear^.Text:= lua_tostring(L, 2);
 vgear^.Hedgehog:= gear^.Hedgehog;
 vgear^.FrameTicks:= lua_tointeger(L, 3);
 if (vgear^.FrameTicks < 1) or (vgear^.FrameTicks > 3) then
 vgear^.FrameTicks:= 1;
-lua_pushinteger(L, vgear^.Uid)
+lua_pushinteger(L, vgear^.Uid);
+AddChatString(#1+'[' + gear^.Hedgehog^.Name + '] '+vgear^.text)
 end
 end
 else
 lua_pushnil(L)
 end
-else LuaError('Lua: Wrong number of parameters passed to HogSay!');
+else LuaParameterCountError('HogSay', 'gearUid, text, manner[, vgState]', lua_gettop(L));
 lc_hogsay:= 1
 end;
 function lc_switchhog(L : Plua_State) : LongInt; Cdecl;
 var gear, prevgear : PGear;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to SwitchHog!')
+LuaParameterCountError('SwitchHog', 'gearUid', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 // should we allow this when there is no current hedgehog? might do some odd(er) things to turn sequence.
 if (gear <> nil) and (gear^.Kind = gtHedgehog) and (gear^.Hedgehog <> nil) and (CurrentHedgehog <> nil) then
 gear:= GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and (gear^.Hedgehog <> nil) then
 AddAmmo(gear^.Hedgehog^, TAmmoType(lua_tointeger(L, 2)));
 end else
 begin
-LuaError('Lua: Wrong number of parameters passed to AddAmmo!');
+LuaParameterCountError('AddAmmo', 'TODO', lua_gettop(L));
 end;
 lc_addammo:= 0;
 end;}
 if lua_gettop(L) = 2 then
 AddAmmo(gear^.Hedgehog^, TAmmoType(lua_tointeger(L, 2)))
 else
 SetAmmo(gear^.Hedgehog^, TAmmoType(lua_tointeger(L, 2)), lua_tointeger(L, 3))
 end
-else LuaError('Lua: Wrong number of parameters passed to AddAmmo!');
+else LuaParameterCountError('AddAmmo', 'gearUid, ammoType[, ammoCount]', lua_gettop(L));
 lc_addammo:= 0
 end;
 function lc_getammocount(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 end
 else lua_pushinteger(L, 0)
 end
 else
 begin
-LuaError('Lua: Wrong number of parameters passed to GetAmmoCount!');
+LuaParameterCountError('GetAmmoCount', 'gearUid, ammoType', lua_gettop(L));
 lua_pushnil(L)
 end;
 lc_getammocount:= 1
 end;
 function lc_sethealth(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SetHealth!');
+LuaParameterCountError('SetHealth', 'gearUid, health', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 begin
 gear^.Health:= lua_tointeger(L, 2);
 if (gear^.Kind = gtHedgehog) and (gear^.Hedgehog <> nil) then
 begin
 RenderHealth(gear^.Hedgehog^);
 RecountTeamHealth(gear^.Hedgehog^.Team)
 end;
+// Why did this do a "setalltoactive" ?
-SetAllToActive;
+//SetAllToActive;
+Gear^.Active:= true;
+AllInactive:= false
 end
 end;
 lc_sethealth:= 0
 end;
 function lc_settimer(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SetTimer!');
+LuaParameterCountError('SetTimer', 'gearUid, timer', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then gear^.Timer:= lua_tointeger(L, 2)
 function lc_seteffect(L : Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 3 then
-LuaError('Lua: Wrong number of parameters passed to SetEffect!')
+LuaParameterCountError('SetEffect', 'gearUid, effect, enabled', lua_gettop(L))
 else begin
 gear := GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and (gear^.Hedgehog <> nil) then
 gear^.Hedgehog^.Effects[THogEffect(lua_tointeger(L, 2))]:= lua_tointeger(L, 3);
 end;
 lc_seteffect := 0;
 end;
 function lc_geteffect(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetEffect!');
+LuaParameterCountError('GetEffect', 'gearUid, effect', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and (gear^.Hedgehog <> nil) then
 function lc_setstate(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SetState!');
+LuaParameterCountError('SetState', 'gearUid, state', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 function lc_getstate(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetState!');
+LuaParameterCountError('GetState', 'gearUid', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 function lc_gettag(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetX!');
+LuaParameterCountError('GetTag', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_settag(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SetTag!');
+LuaParameterCountError('SetTag', 'gearUid, tag', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 begin
 statInfo := TStatInfoType(lua_tointeger(L, 1));
 if (lua_gettop(L) <> 2) and ((statInfo <> siPlayerKills)
 and (statInfo <> siClanHealth)) then
 begin
-LuaError('Lua: Wrong number of parameters passed to SendStat! Expected 2 parameters.');
+LuaParameterCountError('SendStat', 'statInfoType, color', lua_gettop(L));
 end
 else if (lua_gettop(L) <> 3) and ((statInfo = siPlayerKills)
 or (statInfo = siClanHealth)) then
 begin
-LuaError('Lua: Wrong number of parameters passed to SendStat! Expected 3 parameters.');
+LuaParameterCountError('SendStat', 'siClanHealth, color, teamname', lua_gettop(L));
 end
 else
 begin
 if ((statInfo = siPlayerKills) or (statInfo = siClanHealth)) then
 begin
 tryhard: boolean;
 left, right: LongInt;
 begin
 tryhard:= false;
 if (lua_gettop(L) <> 4) and (lua_gettop(L) <> 5) then
-LuaError('Lua: Wrong number of parameters passed to FindPlace!')
+LuaParameterCountError('FindPlace', 'gearUid, fall, left, right[, tryHarder]', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 fall:= lua_toboolean(L, 2);
 left:= lua_tointeger(L, 3);
 begin
 gear:= GearByUID(lua_tointeger(L, 2));
 if (gear <> nil) and (gear^.Kind = gtHedgehog) and (gear^.Hedgehog <> nil) then
 AddVoice(TSound(lua_tointeger(L, 1)),gear^.Hedgehog^.Team^.Voicepack)
 end
-else LuaError('Lua: Wrong number of parameters passed to PlaySound!');
+else LuaParameterCountError('PlaySound', 'soundId', lua_gettop(L));
 lc_playsound:= 0;
 end;
 function lc_addteam(L : Plua_State) : LongInt; Cdecl;
 var np: LongInt;
 begin
 np:= lua_gettop(L);
 if (np < 5) or (np > 6) then
 begin
-LuaError('Lua: Wrong number of parameters passed to AddTeam!');
+LuaParameterCountError('AddTeam', 'teamname, color, grave, fort, voicepack[, flag]', lua_gettop(L));
 //lua_pushnil(L)
 end
 else
 begin
 ParseCommand('addteam x ' + lua_tostring(L, 2) + ' ' + lua_tostring(L, 1), true, true);
 function lc_addhog(L : Plua_State) : LongInt; Cdecl;
 var temp: ShortString;
 begin
 if lua_gettop(L) <> 4 then
 begin
-LuaError('Lua: Wrong number of parameters passed to AddHog!');
+LuaParameterCountError('AddHog', 'hogname, botlevel, health, hat', lua_gettop(L));
 lua_pushnil(L)
 end
 else
 begin
 temp:= lua_tostring(L, 4);
 function lc_hogturnleft(L : Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to HogTurnLeft!');
+LuaParameterCountError('HogTurnLeft', 'gearUid, boolean', lua_gettop(L));
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 function lc_getgearposition(L : Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearPosition!');
+LuaParameterCountError('GetGearPosition', 'gearUid', lua_gettop(L));
 lua_pushnil(L);
 lua_pushnil(L)
 end
 else
 begin
 var gear: PGear;
 col: boolean;
 x, y: LongInt;
 begin
 if lua_gettop(L) <> 3 then
-LuaError('Lua: Wrong number of parameters passed to SetGearPosition!')
+LuaParameterCountError('SetGearPosition', 'gearUid, x, y', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 begin
 function lc_getgeartarget(L : Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearTarget!');
+LuaParameterCountError('GetGearTarget', 'gearUid', lua_gettop(L));
 lua_pushnil(L);
 lua_pushnil(L)
 end
 else
 begin
 function lc_setgeartarget(L : Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 3 then
-LuaError('Lua: Wrong number of parameters passed to SetGearTarget!')
+LuaParameterCountError('SetGearTarget', 'gearUid, x, y', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 begin
 var gear: PGear;
 var t: LongInt;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearVelocity!');
+LuaParameterCountError('GetGearVelocity', 'gearUid', lua_gettop(L));
 lua_pushnil(L);
 lua_pushnil(L)
 end
 else
 begin
 function lc_setgearvelocity(L : Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 3 then
-LuaError('Lua: Wrong number of parameters passed to SetGearVelocity!')
+LuaParameterCountError('SetGearVelocity', 'gearUid, dx, dy', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 begin
 end;
 function lc_setzoom(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to SetZoom!')
+LuaParameterCountError('SetZoom', 'zoomLevel', lua_gettop(L))
 else
 begin
 ZoomValue:= lua_tonumber(L, 1);
 if ZoomValue < cMaxZoomLevel then
 ZoomValue:= cMaxZoomLevel;
 function lc_getzoom(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 0 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetZoom!');
+LuaParameterCountError('GetZoom', '', lua_gettop(L));
 lua_pushnil(L)
 end
 else
 lua_pushnumber(L, ZoomValue);
 lc_getzoom:= 1
 function lc_setammo(L : Plua_State) : LongInt; Cdecl;
 var np: LongInt;
 begin
 np:= lua_gettop(L);
 if (np < 4) or (np > 5) then
-LuaError('Lua: Wrong number of parameters passed to SetAmmo!')
+LuaParameterCountError('SetAmmo', 'ammoType, count, probability, delay[, numberInCrate]', lua_gettop(L))
 else if np = 4 then
 ScriptSetAmmo(TAmmoType(lua_tointeger(L, 1)), lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), 1)
 else
 ScriptSetAmmo(TAmmoType(lua_tointeger(L, 1)), lua_tointeger(L, 2), lua_tointeger(L, 3), lua_tointeger(L, 4), lua_tointeger(L, 5));
 lc_setammo:= 0
 end;
+function lc_setammodelay(L : Plua_State) : LongInt; Cdecl;
+var np: LongInt;
+begin
+np:= lua_gettop(L);
+if (np <> 2) then
+LuaParameterCountError('SetAmmoDelay', 'ammoType, delay', lua_gettop(L))
+else
+ScriptSetAmmoDelay(TAmmoType(lua_tointeger(L, 1)), lua_tointeger(L, 2));
+lc_setammodelay:= 0
+end;
 function lc_setammostore(L : Plua_State) : LongInt; Cdecl;
 var np: LongInt;
 begin
 np:= lua_gettop(L);
 if (np <> 4) then
-LuaError('Lua: Wrong number of parameters passed to SetAmmoStore!')
+LuaParameterCountError('SetAmmoStore', 'loadouts, probabilities, delays, reinforments', lua_gettop(L))
 else
 begin
 ScriptAmmoLoadout:= lua_tostring(L, 1);
 ScriptAmmoProbability:= lua_tostring(L, 2);
 ScriptAmmoDelay:= lua_tostring(L, 3);
 function lc_getrandom(L : Plua_State) : LongInt; Cdecl;
 var m : LongInt;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetRandom!');
+LuaParameterCountError('GetRandom', 'number', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 m:= lua_tointeger(L, 1);
 end;
 function lc_setwind(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to SetWind!')
+LuaParameterCountError('SetWind', 'windSpeed', lua_gettop(L))
 else
 begin
 cWindSpeed:= int2hwfloat(lua_tointeger(L, 1)) / 100 * cMaxWindSpeed;
 cWindSpeedf:= SignAs(cWindSpeed,cWindSpeed).QWordValue / SignAs(_1,_1).QWordValue;
 if cWindSpeed.isNegative then
 function lc_getdatapath(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 0 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetDataPath!');
+LuaParameterCountError('GetDataPath', '', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 lua_pushstring(L, str2pchar(cPathz[ptData]));
 lc_getdatapath:= 1
 function lc_getuserdatapath(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 0 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetUserDataPath!');
+LuaParameterCountError('GetUserDataPath', '', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 lua_pushstring(L, str2pchar(cPathz[ptData]));
 lc_getuserdatapath:= 1
 function lc_maphasborder(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 0 then
 begin
-LuaError('Lua: Wrong number of parameters passed to MapHasBorder!');
+LuaParameterCountError('MapHasBorder', '', lua_gettop(L));
 lua_pushnil(L);
 end
 else
 lua_pushboolean(L, hasBorder);
 lc_maphasborder:= 1
 function lc_getgearradius(L : Plua_State) : LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to GetGearRadius!');
+LuaParameterCountError('GetGearRadius', 'gearUid', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 function lc_gethoghat(L : Plua_State): LongInt; Cdecl;
 var gear : PGear;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to GetHogHat!')
+LuaParameterCountError('GetHogHat', 'gearUid', lua_gettop(L))
 else begin
 gear := GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and ((gear^.Kind = gtHedgehog) or (gear^.Kind = gtGrave)) and (gear^.Hedgehog <> nil) then
 lua_pushstring(L, str2pchar(gear^.Hedgehog^.Hat))
 else
 var gear : PGear;
 hat: ShortString;
 begin
 if lua_gettop(L) <> 2 then
 begin
-LuaError('Lua: Wrong number of parameters passed to SetHogHat!');
+LuaParameterCountError('SetHogHat', 'gearUid, hat', lua_gettop(L));
 lua_pushnil(L)
 end
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if (gear <> nil) and (gear^.Kind = gtHedgehog) and (gear^.Hedgehog <> nil) then
+begin
 hat:= lua_tostring(L, 2);
 gear^.Hedgehog^.Hat:= hat;
 AddFileLog('Changed hat to: '+hat);
 if (Length(hat) > 39) and (Copy(hat,1,8) = 'Reserved') and (Copy(hat,9,32) = gear^.Hedgehog^.Team^.PlayerHash) then
 LoadHedgehogHat(gear^.Hedgehog^, 'Reserved/' + Copy(hat,9,Length(hat)-8))
 else
-LoadHedgehogHat(gear^.Hedgehog^, hat);
+LoadHedgehogHat(gear^.Hedgehog^, hat)
+end
 end;
 lc_sethoghat:= 0;
 end;
 function lc_placegirder(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 3 then
-LuaError('Lua: Wrong number of parameters passed to PlaceGirder!')
+LuaParameterCountError('PlaceGirder', 'x, y, state', lua_gettop(L))
 else
 TryPlaceOnLand(
 lua_tointeger(L, 1) - SpritesData[sprAmGirder].Width div 2,
 lua_tointeger(L, 2) - SpritesData[sprAmGirder].Height div 2,
 sprAmGirder, lua_tointeger(L, 3), true, false);
 end;
 function lc_getcurammotype(L : Plua_State): LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 0 then
-LuaError('Lua: Wrong number of parameters passed to GetCurAmmoType!')
+LuaParameterCountError('GetCurAmmoType', '', lua_gettop(L))
 else
 lua_pushinteger(L, ord(CurrentHedgehog^.CurAmmoType));
 lc_getcurammotype := 1;
 end;
 function lc_savecampaignvar(L : Plua_State): LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 2 then
-LuaError('Lua: Wrong number of parameters passed to SaveCampaignVar!')
+LuaParameterCountError('SaveCampaignVar', 'varname, value', lua_gettop(L))
 else begin
 SendIPC('V!' + lua_tostring(L, 1) + ' ' + lua_tostring(L, 2) + #0);
 end;
 lc_savecampaignvar := 0;
 end;
 function lc_getcampaignvar(L : Plua_State): LongInt; Cdecl;
 begin
 if (lua_gettop(L) <> 1) then
-LuaError('Lua: Wrong number of parameters passed to GetCampaignVar!')
+LuaParameterCountError('GetCampaignVar', 'varname', lua_gettop(L))
 else
-SendIPCAndWaitReply('V?' + lua_tostring(L, 1));
+SendIPCAndWaitReply('V?' + lua_tostring(L, 1) + #0);
 lua_pushstring(L, str2pchar(CampaignVariable));
 lc_getcampaignvar := 1;
 end;
 function lc_hidehog(L: Plua_State): LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to HideHog!')
+LuaParameterCountError('HideHog', 'gearUid', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 HideHog(gear^.hedgehog)
 end;
 function lc_restorehog(L: Plua_State): LongInt; Cdecl;
 var i, h: LongInt;
 uid: LongWord;
 begin
 if lua_gettop(L) <> 1 then
-LuaError('Lua: Wrong number of parameters passed to RestoreHog!')
+LuaParameterCountError('RestoreHog', 'gearUid', lua_gettop(L))
 else
 begin
 uid:= LongWord(lua_tointeger(L, 1));
 if TeamsCount > 0 then
 for i:= 0 to Pred(TeamsCount) do
 function lc_testrectforobstacle(L : Plua_State) : LongInt; Cdecl;
 var rtn: Boolean;
 begin
 if lua_gettop(L) <> 5 then
 begin
-LuaError('Lua: Wrong number of parameters passed to TestRectForObstacle!');
+LuaParameterCountError('TestRectForObstacle', 'x1, y1, x2, y2, landOnly', lua_gettop(L));
 lua_pushnil(L); // return value on stack (nil)
 end
 else
 begin
 rtn:= TestRectancleForObstacle(
 end;
 lc_testrectforobstacle:= 1
 end;
+function lc_getgravity(L : Plua_State) : LongInt; Cdecl;
+begin
+if lua_gettop(L) <> 0 then
+LuaParameterCountError('GetGravity', '', lua_gettop(L))
+else
+lua_pushinteger(L, hwRound(cGravity * 50 / cWindSpeed));
+lc_getgravity:= 1
+end;
+function lc_setgravity(L : Plua_State) : LongInt; Cdecl;
+begin
+if lua_gettop(L) <> 1 then
+LuaParameterCountError('SetGravity', 'gravity', lua_gettop(L))
+else
+begin
+cGravity:= cMaxWindSpeed * lua_tointeger(L, 1) * _0_02;
+cGravityf:= 0.00025 * lua_tointeger(L, 1) * 0.02
+end;
+lc_setgravity:= 0
+end;
+function lc_setwaterline(L : Plua_State) : LongInt; Cdecl;
+var iterator: PGear;
+begin
+if lua_gettop(L) <> 1 then
+LuaParameterCountError('SetWaterLine', 'waterline', lua_gettop(L))
+else
+begin
+cWaterLine:= lua_tointeger(L,1);
+AllInactive:= false;
+iterator:= GearsList;
+while iterator <> nil do
+begin
+if not (iterator^.Kind in [gtPortal, gtAirAttack]) and (iterator^.Message and (gmAllStoppable or gmLJump or gmHJump) = 0) then
+begin
+iterator^.Active:= true;
+if iterator^.dY.QWordValue = 0 then iterator^.dY.isNegative:= false;
+iterator^.State:= iterator^.State or gstMoving;
+DeleteCI(iterator)
+end;
+iterator:= iterator^.NextGear
+end
+end;
+lc_setwaterline:= 0
+end;
 function lc_setaihintsongear(L : Plua_State) : LongInt; Cdecl;
 var gear: PGear;
 begin
 if lua_gettop(L) <> 2 then
-LuaError('Lua: Wrong number of parameters passed to SetAIHintOnGear!')
+LuaParameterCountError('SetAIHintOnGear', 'gearUid, aiHints', lua_gettop(L))
 else
 begin
 gear:= GearByUID(lua_tointeger(L, 1));
 if gear <> nil then
 gear^.aihints:= lua_tointeger(L, 2);
 function lc_hedgewarsscriptload(L : Plua_State) : LongInt; Cdecl;
 begin
 if lua_gettop(L) <> 1 then
 begin
-LuaError('Lua: Wrong number of parameters passed to HedgewarsScriptLoad!');
+LuaParameterCountError('HedgewarsScriptLoad', 'scriptPath', lua_gettop(L));
 lua_pushnil(L)
 end
 else
 ScriptLoad(lua_tostring(L, 1));
 lc_hedgewarsscriptload:= 0;
 end;
 function lc_declareachievement(L : Plua_State) : LongInt; Cdecl;
-var gear: PGear;
 begin
 if lua_gettop(L) <> 4 then
-LuaError('Lua: Wrong number of parameters passed to DeclareAchievement!')
+LuaParameterCountError('DeclareAchievement', 'achievementId, teamname, location, value', lua_gettop(L))
 else
 declareAchievement(lua_tostring(L, 1), lua_tostring(L, 2), lua_tostring(L, 3), lua_tointeger(L, 4));
 lc_declareachievement:= 0
 end;
 ///////////////////
 ScriptSetInteger('Delay', cInactDelay);
 ScriptSetInteger('Ready', cReadyDelay);
 ScriptSetInteger('SuddenDeathTurns', cSuddenDTurns);
 ScriptSetInteger('WaterRise', cWaterRise);
 ScriptSetInteger('HealthDecrease', cHealthDecrease);
+ScriptSetInteger('GetAwayTime', cGetAwayTime);
 ScriptSetString('Map', cMapName);
 ScriptSetString('Theme', '');
 ScriptSetString('Goals', '');
+ScriptSetString('ScriptParam', cScriptParam);
 ScriptCall('onGameInit');
 // pop game variables
 ParseCommand('seed ' + ScriptGetString('Seed'), true, true);
 cInactDelay      := ScriptGetInteger('Delay');
 cReadyDelay      := ScriptGetInteger('Ready');
 cSuddenDTurns    := ScriptGetInteger('SuddenDeathTurns');
 cWaterRise       := ScriptGetInteger('WaterRise');
 cHealthDecrease  := ScriptGetInteger('HealthDecrease');
+cGetAwayTime     := ScriptGetInteger('GetAwayTime');
 if cMapName <> ScriptGetString('Map') then
 ParseCommand('map ' + ScriptGetString('Map'), true, true);
 if ScriptGetString('Theme') <> '' then
 ParseCommand('theme ' + ScriptGetString('Theme'), true, true);
 end;
 ScriptApplyAmmoStore
 end;
 ScriptSetInteger('ClansCount', ClansCount);
-ScriptSetInteger('TeamsCount', TeamsCount)
+ScriptSetInteger('TeamsCount', TeamsCount);
+mapDims:= false
 end;
 // Update values of screen dimensions and allow script to react to resolution change
 procedure ScriptOnScreenResize();
 f : PFSFile;
 buf : array[0..Pred(BUFSIZE)] of byte;
 begin
 s:= cPathz[ptData] + name;
 if not pfsExists(s) then
+begin
+AddFileLog('[LUA] Script not found: ' + name);
 exit;
+end;
 f:= pfsOpenRead(s);
 if f = nil then
 exit;
 begin
 ScriptSetInteger('TurnTimeLeft', TurnTimeLeft);
 ScriptSetInteger('GameTime', GameTicks);
 ScriptSetInteger('TotalRounds', TotalRounds);
 ScriptSetInteger('WaterLine', cWaterLine);
-if GameTicks = 0 then
+if not mapDims then
 begin
+mapDims:= true;
 ScriptSetInteger('LAND_WIDTH', LAND_WIDTH);
 ScriptSetInteger('LAND_HEIGHT', LAND_HEIGHT);
 ScriptSetInteger('LeftX', leftX);
 ScriptSetInteger('RightX', rightX);
 ScriptSetInteger('TopY', topY)
 ScriptAmmoDelay:= ScriptAmmoDelay + '0';
 ScriptAmmoReinforcement:= ScriptAmmoReinforcement + '0';
 end;
 end;
-procedure ScriptSetAmmo(ammo : TAmmoType; count, propability, delay, reinforcement: Byte);
+procedure ScriptSetAmmo(ammo : TAmmoType; count, probability, delay, reinforcement: Byte);
 begin
-//if (ord(ammo) < 1) or (count > 9) or (count < 0) or (propability < 0) or (propability > 8) or (delay < 0) or (delay > 9) or (reinforcement < 0) or (reinforcement > 8) then
+//if (ord(ammo) < 1) or (count > 9) or (count < 0) or (probability < 0) or (probability > 8) or (delay < 0) or (delay > 9) or (reinforcement < 0) or (reinforcement > 8) then
-if (ord(ammo) < 1) or (count > 9) or (propability > 8) or (delay > 9) or (reinforcement > 8) then
+if (ord(ammo) < 1) or (count > 9) or (probability > 8) or (delay > 9) or (reinforcement > 8) then
 exit;
 ScriptAmmoLoadout[ord(ammo)]:= inttostr(count)[1];
-ScriptAmmoProbability[ord(ammo)]:= inttostr(propability)[1];
+ScriptAmmoProbability[ord(ammo)]:= inttostr(probability)[1];
-ScriptAmmoDelay[ord(ammo)]:= inttostr(delay)[1];
+ScriptSetAmmoDelay(ammo, delay);
 ScriptAmmoReinforcement[ord(ammo)]:= inttostr(reinforcement)[1];
+end;
+procedure ScriptSetAmmoDelay(ammo : TAmmoType; delay: Byte);
+begin
+// change loadout string if ammo store hasn't been initialized yet
+if (StoreCnt = 0) then
+begin
+if (delay <= 9) then
+ScriptAmmoDelay[ord(ammo)]:= inttostr(delay)[1];
+end
+// change "live" delay values
+else if (CurrentTeam <> nil) then
+ammoz[ammo].SkipTurns:= CurrentTeam^.Clan^.TurnNumber + delay;
 end;
 procedure ScriptApplyAmmoStore;
 var i, j, k : LongInt;
 begin
 procedure initModule;
 var at : TGearType;
 vgt: TVisualGearType;
 am : TAmmoType;
+si : TStatInfoType;
 st : TSound;
 he : THogEffect;
 cg : TCapGroup;
 begin
 // initialize lua
 ScriptSetInteger('gmTimer', gmTimer);
 ScriptSetInteger('gmAnimate', gmAnimate);
 ScriptSetInteger('gmPrecise', gmPrecise);
 ScriptSetInteger('gmAllStoppable', gmAllStoppable);
 // speech bubbles
 ScriptSetInteger('SAY_SAY', 1);
 ScriptSetInteger('SAY_THINK', 2);
 ScriptSetInteger('SAY_SHOUT', 3);
 ScriptSetInteger(EnumToStr(st), ord(st));
 // register ammo types
 for am:= Low(TAmmoType) to High(TAmmoType) do
 ScriptSetInteger(EnumToStr(am), ord(am));
+for si:= Low(TStatInfoType) to High(TStatInfoType) do
+ScriptSetInteger(EnumToStr(si), ord(si));
 for he:= Low(THogEffect) to High(THogEffect) do
 ScriptSetInteger(EnumToStr(he), ord(he));
 for cg:= Low(TCapGroup) to High(TCapGroup) do
 lua_register(luaState, _P'ParseCommand', @lc_parsecommand);
 lua_register(luaState, _P'ShowMission', @lc_showmission);
 lua_register(luaState, _P'HideMission', @lc_hidemission);
 lua_register(luaState, _P'AddCaption', @lc_addcaption);
 lua_register(luaState, _P'SetAmmo', @lc_setammo);
+lua_register(luaState, _P'SetAmmoDelay', @lc_setammodelay);
 lua_register(luaState, _P'SetAmmoStore', @lc_setammostore);
 lua_register(luaState, _P'PlaySound', @lc_playsound);
 lua_register(luaState, _P'AddTeam', @lc_addteam);
 lua_register(luaState, _P'AddHog', @lc_addhog);
 lua_register(luaState, _P'AddAmmo', @lc_addammo);
 lua_register(luaState, _P'GetEffect', @lc_geteffect);
 lua_register(luaState, _P'GetHogClan', @lc_gethogclan);
 lua_register(luaState, _P'GetClanColor', @lc_getclancolor);
 lua_register(luaState, _P'SetClanColor', @lc_setclancolor);
 lua_register(luaState, _P'GetHogTeamName', @lc_gethogteamname);
+lua_register(luaState, _P'SetHogTeamName', @lc_sethogteamname);
 lua_register(luaState, _P'GetHogName', @lc_gethogname);
 lua_register(luaState, _P'SetHogName', @lc_sethogname);
 lua_register(luaState, _P'GetHogLevel', @lc_gethoglevel);
 lua_register(luaState, _P'SetHogLevel', @lc_sethoglevel);
 lua_register(luaState, _P'GetX', @lc_getx);
 lua_register(luaState, _P'GetHogHat', @lc_gethoghat);
 lua_register(luaState, _P'SetHogHat', @lc_sethoghat);
 lua_register(luaState, _P'PlaceGirder', @lc_placegirder);
 lua_register(luaState, _P'GetCurAmmoType', @lc_getcurammotype);
 lua_register(luaState, _P'TestRectForObstacle', @lc_testrectforobstacle);
+lua_register(luaState, _P'GetGravity', @lc_getgravity);
+lua_register(luaState, _P'SetGravity', @lc_setgravity);
+lua_register(luaState, _P'SetWaterLine', @lc_setwaterline);
 lua_register(luaState, _P'SetGearAIHints', @lc_setaihintsongear);
 lua_register(luaState, _P'HedgewarsScriptLoad', @lc_hedgewarsscriptload);
 lua_register(luaState, _P'DeclareAchievement', @lc_declareachievement);
 begin
 end;
 procedure initModule;
 begin
+mapDims:= false;
 end;
 procedure freeModule;
 begin
 end;

branch	webgl
changeset 9950	2759212a27de
parent 9521	8054d9d775fd
parent 9917	1ca194a8b509
child 9952	32f5982604f4