diff -r e7bea88096d2 -r 7e71dba4e7f3 share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua
--- a/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua	Thu Feb 28 23:15:33 2013 -0500
+++ b/share/hedgewars/Data/Scripts/Multiplayer/Continental_supplies.lua	Fri Mar 01 10:38:49 2013 -0500
@@ -1,5 +1,5 @@
 --[[
-Continental Supplies version 1.1a
+Version 1.1c
 
 Copyright (C) 2012 Vatten
 
@@ -15,16 +15,24 @@
 HedgewarsScriptLoad("/Scripts/Tracker.lua")
 
 function int_sqrt(num)
-	temp=num
+	local temp=num
 	while(temp*temp-div(temp,2)>num)
 	do
 		temp=div((temp+div(num,temp)),2)
 	end
+	
 	return math.abs(temp)
 end
 
 function norm(xx,yy)
-	return int_sqrt((xx^2)+(yy^2))
+	--to fix overflows
+	if(((math.abs(xx)^2)+(math.abs(yy)^2))>2^26)
+	then
+		local bitr=2^13
+		return int_sqrt((div(math.abs(xx),bitr)^2)+(div(math.abs(yy),bitr)^2))*bitr
+	else
+		return int_sqrt((math.abs(xx)^2)+(math.abs(yy)^2))
+	end
 end
 
 function positive(num)
@@ -40,7 +48,7 @@
 local wepcode_teams={}
 local swapweps=false
 
---run when game starts on real
+--variables for seeing if you have swaped around on a weapon
 local australianSpecial=false
 local africanSpecial=0
 local africaspecial2=0
@@ -51,32 +59,37 @@
 local kergulenSpecial=1
 local shotgun_s=false
 local europe_s=0
+local VampOn=0
 
 local austmine=nil
 local inpara=false
 local asianflame=0
 
+local visualcircle=nil
+
 local temp_val=0
 
---f?r sabotage
+--for sabotage
 local disallowattack=0
-local disallowleft=true
 local disable_moving={}
+local disableoffsetai=0
+local onsabotageai=false
 
---skall bytas till f?r alla teams
 local continent = {}
 
+local generalinfo=loc("- Per team weapons|- 9 weaponschemes|- Unique new weapons| |Select continent first round with the Weapon Menu or by ([switch/tab]=Increase,[presice/left shift]=Decrease) on Skip|Some weapons have a second option. Find them with [switch/tab]")
+
 local weapontexts = {
 loc("Green lipstick bullet: [Is poisonous]"),
 loc("Piñata bullet: [Contains some sweet candy!]"),
 loc("Anno 1032: [The explosion will make a strong push ~ wide range, wont affect hogs close to the target]"),
-loc("Dust storm: [Deals 20 damage to all enemies in the circle]"),
+loc("Dust storm: [Deals 15 damage to all enemies in the circle]"),
 loc("Fire a mine: [Does what it says ~ Cant be dropped close to an enemy ~ 1 sec]"),
-loc("Drop a bomb: [drop some heroic wind that will turn into a bomb on impact]"),
+loc("Drop a bomb: [drop some heroic wind that will turn into a bomb on impact ~ once per turn]"),
 loc("Scream from a Walrus: [Deal 20 damage + 10% of your hogs health to all hogs around you and get half back]"),
 loc("Disguise as a Rockhopper Penguin: [Swap place with a random enemy hog in the circle]"),
 loc("Flare: [fire up some bombs depending on hogs depending on hogs in the circle"),
-loc("Lonely Cries: [Rise the water if no hog is in the circle and deal 1 damage to all hogs]"),
+loc("Lonely Cries: [Rise the water if no hog is in the circle and deal 7 damage to all enemy hogs]"),
 loc("Hedgehog projectile: [fire your hog like a Sticky Bomb]"),
 loc("Napalm rocket: [Fire a bomb with napalm!]"),
 loc("Eagle Eye: [Blink to the impact ~ one shot]"),
@@ -90,31 +103,43 @@
 {{amShotgun,100},{amDEagle,100},{amLaserSight,4},{amSniperRifle,100},{amCake,1},{amAirAttack,2},{amSwitch,6}}},
 
 {loc("South America"),"Area: 17,840,000 km2, Population: 387,489,196 ",loc("Special Weapons:").."|"..loc("GasBomb")..": "..weapontexts[3],amGasBomb,
-{{amBirdy,5},{amHellishBomb,1},{amBee,100},{amWhip,100},{amGasBomb,100},{amFlamethrower,100},{amNapalm,1},{amExtraDamage,2}}},
+{{amBirdy,6},{amHellishBomb,1},{amBee,100},{amWhip,100},{amGasBomb,100},{amFlamethrower,100},{amNapalm,1},{amExtraDamage,2}}},
 
 {loc("Europe"),"Area: 10,180,000 km2, Population: 739,165,030",loc("Special Weapons:").."|"..loc("Molotov")..": "..weapontexts[14],amBazooka,
 {{amBazooka,100},{amGrenade,100},{amMortar,100},{amClusterBomb,5},{amMolotov,5},{amVampiric,4},{amPiano,1},{amResurrector,2},{amJetpack,2}}},
 
 {loc("Africa"),"Area: 30,221,532 km2, Population: 1,032,532,974",loc("Special Weapons:").."|"..loc("Seduction")..": "..weapontexts[4].."|"..loc("Sticky Mine")..": "..weapontexts[11].."|"..loc("Sticky Mine")..": "..weapontexts[12],amSMine,
-{{amSMine,6},{amWatermelon,1},{amDrillStrike,1},{amExtraTime,2},{amDrill,100},{amLandGun,3},{amSeduction,100}}},
+{{amSMine,100},{amWatermelon,1},{amDrillStrike,1},{amExtraTime,2},{amDrill,100},{amLandGun,3},{amSeduction,100}}},
 
-{loc("Asia"),"Area: 44,579,000 km2, Population: 3,879,000,000",loc("- Will refresh Parachute each turn.").."|"..loc("Special Weapons:").."|"..loc("Parachute")..": "..weapontexts[6],amRope,
-{{amKamikaze,4},{amRope,100},{amFirePunch,100},{amParachute,1},{amKnife,4},{amDynamite,1}}},
+{loc("Asia"),"Area: 44,579,000 km2, Population: 3,879,000,000",loc("- Will give you a parachute each turn.").."|"..loc("Special Weapons:").."|"..loc("Parachute")..": "..weapontexts[6],amRope,
+{{amKamikaze,4},{amRope,100},{amFirePunch,100},{amParachute,1},{amKnife,2},{amDynamite,1}}},
 
 {loc("Australia"),"Area:  8,468,300 km2, Population: 31,260,000",loc("Special Weapons:").."|"..loc("Baseballbat")..": "..weapontexts[5],amBaseballBat,
 {{amBaseballBat,100},{amMine,100},{amLowGravity,6},{amBlowTorch,100},{amRCPlane,2},{amTardis,100}}},
 
-{loc("Antarctica"),"Area: 14,000,000 km2, Population: ~1,000",loc("- Will refresh portalgun each turn."),amTeleport,
-{{amSnowball,4},{amTeleport,2},{amInvulnerable,6},{amPickHammer,100},{amSineGun,100},{amGirder,4},{amPortalGun,1}}},
+{loc("Antarctica"),"Area: 14,000,000 km2, Population: ~1,000",loc("- Will give you a portalgun every second turn."),amTeleport,
+{{amSnowball,4},{amTeleport,2},{amInvulnerable,6},{amPickHammer,100},{amSineGun,100},{amGirder,3},{amPortalGun,2}}},
 
-{loc("Kerguelen"),"Area: 1,100,000 km2, Population: ~70",loc("Special Weapons:").."|"..loc("Structure")..": "..weapontexts[7].."|"..loc("Structure")..": "..weapontexts[8].." ("..loc("Duration")..": 2)|"..loc("Structure")..": "..weapontexts[9].."|"..loc("Structure")..": "..weapontexts[10],amStructure,
-{{amHammer,100},{amMineStrike,2},{amBallgun,1},{amStructure,100}}},
---no ,{amIceGun,4} for 0.9.18
+{loc("Kerguelen"),"Area: 1,100,000 km2, Population: ~70",loc("Special Weapons:").."|"..loc("Hammer")..": "..weapontexts[7].."|"..loc("Hammer")..": "..weapontexts[8].." ("..loc("Duration")..": 2)|"..loc("Hammer")..": "..weapontexts[9].."|"..loc("Hammer")..": "..weapontexts[10].."|"..loc("Hammer")..": "..weapontexts[15],amHammer,
+{{amHammer,100},{amMineStrike,2},{amBallgun,1},{amIceGun,2}}},
 
 {loc("Zealandia"),"Area: 3,500,000 km2, Population: 4,650,000",loc("- Will Get 1-3 random weapons"),amInvulnerable,
 {{amBazooka,1},{amBlowTorch,1},{amSwitch,1}}}
 }
 
+local weaponsetssounds=
+{
+{sndShotgunFire,sndCover},
+{sndEggBreak,sndLaugh},
+{sndExplosion,sndEnemyDown},
+{sndMelonImpact,sndHello},
+{sndRopeAttach,sndComeonthen},
+{sndBaseballBat,sndNooo},
+{sndSineGun,sndOops},
+{sndPiano5,sndStupid},
+{sndSplash,sndFirstBlood}
+}
+
 --weapontype,ammo,?,duration,*times your choice,affect on random team (should be placed with 1,0,1,0,1 on the 6th option for better randomness)
 local weapons_dmg = {
 	{amKamikaze, 0, 1, 0, 1, 0},
@@ -152,8 +177,8 @@
 	{amSMine, 0, 1, 0, 1, 1},
 	{amHammer, 0, 1, 0, 1, 0},
 	{amDrillStrike, 0, 1, 4, 1, 2},
-	{amSnowball, 0, 1, 0, 1, 0},
-	{amStructure, 0, 0, 0, 1, 1}
+	{amSnowball, 0, 1, 0, 1, 0}
+	--{amStructure, 0, 0, 0, 1, 1}
 }
 local weapons_supp = {
 	{amParachute, 0, 1, 0, 1, 0},
@@ -175,7 +200,8 @@
 	{amIceGun, 0, 1, 0, 1, 0},
 	{amKnife, 0, 1, 0, 1, 0}
 }
-	
+
+--will check after borders and stuff
 function validate_weapon(hog,weapon,amount)
 	if(MapHasBorder() == false or (MapHasBorder() == true and weapon ~= amAirAttack and weapon ~= amMineStrike and weapon ~= amNapalm and weapon ~= amDrillStrike and weapon ~= amPiano))
 	then
@@ -187,8 +213,8 @@
 function cleanweps(hog)
 
 	local i=1
-	--+1 for skip
-	while(i<=table.getn(weapons_supp)+table.getn(weapons_dmg)+1)
+	--+1 for skip +1 for freezer
+	while(i<=table.maxn(weapons_supp)+table.maxn(weapons_dmg)+2)
 	do
 		AddAmmo(hog,i,0)
 		i=i+1
@@ -197,6 +223,7 @@
 	AddAmmo(hog,amSkip,100)
 end
 
+--get the weapons from a weaponset
 function load_weaponset(hog, num)
 	for v,w in pairs(weaponsets[num][5]) 
 	do
@@ -204,6 +231,7 @@
 	end
 end
 
+--list up all weapons from the icons for each continent
 function load_continent_selection(hog)
 	for v,w in pairs(weaponsets) 
 	do
@@ -212,20 +240,27 @@
 	AddAmmo(hog,amSwitch) --random continent
 end
 
-function show_continent_info(continent,time)
+--shows the continent info
+function show_continent_info(continent,time,generalinf)
+	local geninftext=""
 	local ns=false
 	if(time==-1)
 	then
 		time=0
 		ns=true
 	end
-	ShowMission(weaponsets[continent][1],weaponsets[continent][2],weaponsets[continent][3], -weaponsets[continent][4], time)
+	if(generalinf)
+	then
+		geninftext="| |"..loc("General information")..": |"..generalinfo
+	end
+	ShowMission(weaponsets[continent][1],weaponsets[continent][2],weaponsets[continent][3]..geninftext, -weaponsets[continent][4], time)
 	if(ns)
 	then
 		HideMission()
 	end
 end
 
+--will show a circle of gears (eye candy)
 function visual_gear_explosion(range,xpos,ypos,gear1,gear2)
 	local degr=0
 	local lap=30
@@ -245,94 +280,97 @@
 	end
 end
 
---zealandia
+--zealandia (generates weapons from the weaponinfo above
 function get_random_weapon(hog)
-	if(GetGearType(hog) == gtHedgehog)
+	if(GetGearType(hog) == gtHedgehog and continent[GetHogTeamName(hog)]==9 and getTeamValue(GetHogTeamName(hog), "rand-done-turn")==nil)
 	then
+		cleanweps(hog)
+	
 		local random_weapon = 0
 		local old_rand_weap = 0
 		local rand_weaponset_power = 0
 		
-		if(continent[GetHogTeamName(hog)]==9 and (getTeamValue(GetHogTeamName(hog), "rand-done-turn")==false or getTeamValue(GetHogTeamName(hog), "rand-done-turn")==nil))
-		then
-			cleanweps(hog)
+		local numberof_weapons_supp=table.maxn(weapons_supp)
+		local numberof_weapons_dmg=table.maxn(weapons_dmg)
+		
+		local rand1=GetRandom(table.maxn(weapons_supp))+1
+		local rand2=GetRandom(table.maxn(weapons_dmg))+1
+		
+		random_weapon = GetRandom(table.maxn(weapons_dmg))+1
+		
+		while(weapons_dmg[random_weapon][4]>TotalRounds)
+		do
+			if(random_weapon>=numberof_weapons_dmg)
+			then
+				random_weapon=0
+			end
+			random_weapon = random_weapon+1
+		end
+		validate_weapon(hog, weapons_dmg[random_weapon][1],1)
+		rand_weaponset_power=weapons_dmg[random_weapon][6]
+		old_rand_weap = random_weapon
 		
-			random_weapon = GetRandom(table.getn(weapons_dmg))+1
-			while(weapons_dmg[random_weapon][4]>TotalRounds)
+		if(rand_weaponset_power <2)
+		then
+			random_weapon = rand1
+			while(weapons_supp[random_weapon][4]>TotalRounds or rand_weaponset_power+weapons_supp[random_weapon][6]>2)
 			do
-				if(random_weapon>=table.getn(weapons_dmg))
+				if(random_weapon>=numberof_weapons_supp)
+				then
+					random_weapon=0
+				end
+				random_weapon = random_weapon+1
+			end
+			validate_weapon(hog, weapons_supp[random_weapon][1],1)
+			rand_weaponset_power=rand_weaponset_power+weapons_supp[random_weapon][6]
+		end
+		--check again if  the power is enough
+		if(rand_weaponset_power <1)
+		then
+			random_weapon = rand2
+			while(weapons_dmg[random_weapon][4]>TotalRounds or old_rand_weap == random_weapon or weapons_dmg[random_weapon][6]>0)
+			do
+				if(random_weapon>=numberof_weapons_dmg)
 				then
 					random_weapon=0
 				end
 				random_weapon = random_weapon+1
 			end
 			validate_weapon(hog, weapons_dmg[random_weapon][1],1)
-			rand_weaponset_power=weapons_dmg[random_weapon][6]
-			old_rand_weap = random_weapon
+		end
 			
-			if(rand_weaponset_power <2)
-			then
-				random_weapon = GetRandom(table.getn(weapons_supp))+1
-				while(weapons_supp[random_weapon][4]>TotalRounds or rand_weaponset_power+weapons_supp[random_weapon][6]>2)
-				do
-					if(random_weapon>=table.getn(weapons_supp))
-					then
-						random_weapon=0
-					end
-					random_weapon = random_weapon+1
-				end
-				validate_weapon(hog, weapons_supp[random_weapon][1],1)
-				rand_weaponset_power=rand_weaponset_power+weapons_supp[random_weapon][6]
-			end
-			--check again if  the power is enough
-			if(rand_weaponset_power <1)
-			then
-				random_weapon = GetRandom(table.getn(weapons_dmg))+1
-				while(weapons_dmg[random_weapon][4]>TotalRounds or old_rand_weap == random_weapon or weapons_dmg[random_weapon][6]>0)
-				do
-					if(random_weapon>=table.getn(weapons_dmg))
-					then
-						random_weapon=0
-					end
-					random_weapon = random_weapon+1
-				end
-				validate_weapon(hog, weapons_dmg[random_weapon][1],1)
-			end
-				
-			setTeamValue(GetHogTeamName(hog), "rand-done-turn", true)
-			
-			if(GetHogTeamName(hog)==GetHogTeamName(CurrentHedgehog))
-			then
-				temp_val=false
-			end
-		end
+		setTeamValue(GetHogTeamName(hog), "rand-done-turn", true)
 	end
 end
 
-
-function setweapons(skipafter)
+--this will take that hogs settings for the weapons and add them
+function setweapons()
 
 	cleanweps(CurrentHedgehog)
 	load_weaponset(CurrentHedgehog,continent[GetHogTeamName(CurrentHedgehog)])
-	if(skipafter==true)
-	then
-		ParseCommand("setweap " .. string.char(amSkip))
-	end
-
-	show_continent_info(continent[GetHogTeamName(CurrentHedgehog)],0)
+	
+	visualstuff=AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog)-5, vgtDust,0, false)
+	v1, v2, v3, v4, v5, v6, v7, v8, v9, v10 = GetVisualGearValues(visualstuff)
+	SetVisualGearValues(visualstuff, v1, v2, v3, v4, v5, v6, v7, 2, v9, GetClanColor(GetHogClan(CurrentHedgehog)))
+	
+	show_continent_info(continent[GetHogTeamName(CurrentHedgehog)],0,false)
 end
 
+--show health tag (will mostly be used when a hog is damaged)
 function show_damage_tag(hog,damage)
 	healthtag=AddVisualGear(GetX(hog), GetY(hog), vgtHealthTag, damage, false)
 	v1, v2, v3, v4, v5, v6, v7, v8, v9, v10 = GetVisualGearValues(healthtag)
 	SetVisualGearValues(healthtag, v1, v2, v3, v4, v5, v6, v7, v8, v9, GetClanColor(GetHogClan(hog)))
 end
 
+--will use int_sqrt
 function fire_gear(hedgehog,geartype,vx,vy,timer)
-	return AddGear(div((GetGearRadius(hedgehog)*2*vx),norm(vx,vy))+GetX(hedgehog), div((GetGearRadius(hedgehog)*2*vy),norm(vx,vy))+GetY(hedgehog), geartype, 0, vx, vy, timer)
+	local hypo=norm(vx,vy)
+	return AddGear(div((GetGearRadius(hedgehog)*2*vx),hypo)+GetX(hedgehog), div((GetGearRadius(hedgehog)*2*vy),hypo)+GetY(hedgehog), geartype, 0, vx, vy, timer)
 end
 
 --==========================run throw all hog/gear weapons ==========================
+--will check if the mine is nicely placed 
 function weapon_aust_check(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
@@ -343,16 +381,19 @@
 	end
 end
 
+--african special on sedunction
 function weapon_duststorm(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
-		local dmg=20
+		local dmg=15
 		if(gearIsInCircle(hog,GetX(CurrentHedgehog), GetY(CurrentHedgehog), 250, false)==true and GetHogClan(hog) ~= GetHogClan(CurrentHedgehog))
 		then
 			if(GetHealth(hog) > dmg)
 			then
+				temp_val=temp_val+div(dmg*VampOn,100)
 				SetHealth(hog, GetHealth(hog)-dmg)
 			else
+				temp_val=temp_val+div(GetHealth(hog)*VampOn,100)
 				SetHealth(hog, 0)
 			end
 			show_damage_tag(hog,dmg)
@@ -360,6 +401,7 @@
 	end
 end
 
+--kerguelen special on structure 
 function weapon_scream_walrus(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
@@ -367,11 +409,11 @@
 		then
 			if(GetHealth(hog)>(20+GetHealth(CurrentHedgehog)*0.1))
 			then
+				temp_val=temp_val+10+(GetHealth(CurrentHedgehog)*0.05)+div((20+GetHealth(CurrentHedgehog)*0.1)*VampOn,100)
 				SetHealth(hog, GetHealth(hog)-(20+GetHealth(CurrentHedgehog)*0.1))
-				temp_val=temp_val+10+GetHealth(CurrentHedgehog)*0.05
 			else
+				temp_val=temp_val+(GetHealth(hog)*0.5)+(GetHealth(CurrentHedgehog)*0.05)+div((GetHealth(hog)+(GetHealth(CurrentHedgehog)*0.1))*VampOn,100)
 				SetHealth(hog, 0)
-				temp_val=temp_val+(GetHealth(hog)*0.5)+(GetHealth(CurrentHedgehog)*0.05)
 			end
 			show_damage_tag(hog,(20+GetHealth(CurrentHedgehog)*0.1))
 			AddVisualGear(GetX(hog), GetY(hog), vgtExplosion, 0, false)
@@ -380,6 +422,7 @@
 	end
 end
 
+--kerguelen special swap hog
 function weapon_swap_kerg(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
@@ -394,6 +437,7 @@
 	end
 end
 
+--kerguelen special on structure
 function weapon_flare(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
@@ -414,6 +458,7 @@
 	end
 end
 
+--kerguelen special will apply sabotage
 function weapon_sabotage(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
@@ -426,10 +471,12 @@
 	end
 end
 
+--south american special (used fire gear)
 function weapon_anno_south(hog)
-	local power_radius_outer=250
-	local power_radius_inner=40
+	local power_radius_outer=230
+	local power_radius_inner=45
 	local power_sa=500000
+	local hypo=0
 	if(gearIsInCircle(hog,GetX(temp_val), GetY(temp_val), power_radius_outer, false) and gearIsInCircle(hog,GetX(temp_val), GetY(temp_val), power_radius_inner, false)==false)
 	then
 		if(hog == CurrentHedgehog)
@@ -437,32 +484,41 @@
 			SetState(CurrentHedgehog, gstMoving)
 		end
 		SetGearPosition(hog, GetX(hog),GetY(hog)-3)
-		SetGearVelocity(hog, div((power_radius_outer-norm(math.abs(GetX(hog)-GetX(temp_val)),math.abs(GetY(hog)-GetY(temp_val))))*power_sa*positive(GetX(hog)-GetX(temp_val)),power_radius_outer), div((power_radius_outer-norm(math.abs(GetX(hog)-GetX(temp_val)),math.abs(GetY(hog)-GetY(temp_val))))*power_sa*positive(GetY(hog)-GetY(temp_val)),power_radius_outer))
+		hypo=norm(math.abs(GetX(hog)-GetX(temp_val)),math.abs(GetY(hog)-GetY(temp_val)))
+		SetGearVelocity(hog, div((power_radius_outer-hypo)*power_sa*positive(GetX(hog)-GetX(temp_val)),power_radius_outer), div((power_radius_outer-hypo)*power_sa*positive(GetY(hog)-GetY(temp_val)),power_radius_outer))
+	end
+end
+
+--first part on kerguelen special (lonely cries)
+function weapon_cries_a(hog)
+	if(GetGearType(hog) == gtHedgehog and hog ~= CurrentHedgehog and gearIsInCircle(hog,GetX(CurrentHedgehog), GetY(CurrentHedgehog), 500, false))
+	then
+		kergulenSpecial=-1
 	end
 end
 
-function weapon_cries_a(hog)
-	if(GetGearType(hog) == gtHedgehog)
-	then
-		if(GetHogClan(hog) ~= GetHogClan(CurrentHedgehog) and gearIsInCircle(hog,GetX(CurrentHedgehog), GetY(CurrentHedgehog), 500, false))
-		then
-			kergulenSpecial=-1
-		end
-	end
-end
-
+--second part on kerguelen special (lonely cries)
 function weapon_cries_b(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
+		local dmg=7
 		if(GetHogClan(hog) ~= GetHogClan(CurrentHedgehog))
 		then
-			SetHealth(hog, GetHealth(hog)-1)
-			show_damage_tag(hog,1)
+			if(GetHealth(hog) > dmg)
+			then
+				temp_val=temp_val+div(dmg*VampOn,100)
+				SetHealth(hog, GetHealth(hog)-dmg)
+			else
+				temp_val=temp_val+div(GetHealth(hog)*VampOn,100)
+				SetHealth(hog, 0)
+			end
+			show_damage_tag(hog,dmg)
 			AddVisualGear(GetX(hog), GetY(hog)-30, vgtEvilTrace, 0, false)
 		end
 	end
 end
 
+--north american special on sniper
 function weapon_lipstick(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
@@ -474,6 +530,7 @@
 	end
 end
 
+--european special on molotov (used fire gear)
 function weapon_health(hog)
 	if(GetGearType(hog) == gtHedgehog)
 	then
@@ -505,13 +562,14 @@
 function onGameStart()
 	--trackTeams()
 
-	ShowMission(loc("Continental supplies").." 1.1a",loc("Let a Continent provide your weapons!"),
-	loc("- Per team weapons|- 9 weaponschemes|- Unique new weapons| |Select continent first round with the Weapon Menu or by ([switch/tab]=Increase,[precise/left shift]=Decrease) on Skip|Some weapons have a second option. Find them with [switch/tab]"), -amLowGravity, 0)
+	ShowMission(loc("Continental supplies").." 1.1c",loc("Let a Continent provide your weapons!"),
+	loc(generalinfo), -amLowGravity, 0)
 end
 
 --what happen when a turn starts
 function onNewTurn()
-
+	
+	--will refresh the info on each tab weapon
 	australianSpecial=true
 	asianSpecial=false
 	austmine=nil
@@ -524,13 +582,18 @@
 	shotgun_s=false
 	sniper_s_in_use=false
 	europe_s=0
+	VampOn=0
 	
 	temp_val=0
 	
+	--for sabotage
 	disallowattack=0
-	disallowleft=true
+	if(disable_moving[CurrentHedgehog]==true)
+	then
+		disableoffsetai=GetHogLevel(CurrentHedgehog)
+	end
+	
 	--when all hogs are "placed"
-	
 	if(GetCurAmmoType()~=amTeleport)
 	then
 		--will run once when the game really starts (after placing hogs and so on
@@ -543,34 +606,42 @@
 			swapweps=true
 			teams_ok[GetHogTeamName(CurrentHedgehog)] = 2
 		else
+			--if its not the initialization turn
 			swapweps=false
 			if(continent[GetHogTeamName(CurrentHedgehog)]==0)
 			then
-				continent[GetHogTeamName(CurrentHedgehog)]=GetRandom(table.getn(weaponsets))+1
-				setweapons(false)
+				continent[GetHogTeamName(CurrentHedgehog)]=GetRandom(table.maxn(weaponsets))+1
+				setweapons()
 			end
-			show_continent_info(continent[GetHogTeamName(CurrentHedgehog)],-1)
+			show_continent_info(continent[GetHogTeamName(CurrentHedgehog)],-1,true)
+			
+			--give zeelandia-teams new weapons so they can plan for the next turn
+			runOnGears(get_random_weapon)
+			
+			--some specials for some continents (temp_val is from get random weapons)
+			if(continent[GetHogTeamName(CurrentHedgehog)]==9)
+			then
+				setTeamValue(GetHogTeamName(CurrentHedgehog), "rand-done-turn", nil)
+			elseif(continent[GetHogTeamName(CurrentHedgehog)]==7)
+			then
+				if(getTeamValue(GetHogTeamName(CurrentHedgehog), "Antarctica-turntick")==nil)
+				then
+					setTeamValue(GetHogTeamName(CurrentHedgehog), "Antarctica-turntick", 1)
+				end
+				
+				if(getTeamValue(GetHogTeamName(CurrentHedgehog), "Antarctica-turntick")>=2)
+				then
+					AddAmmo(CurrentHedgehog,amPortalGun)
+					setTeamValue(GetHogTeamName(CurrentHedgehog), "Antarctica-turntick", 0)
+				end
+				setTeamValue(GetHogTeamName(CurrentHedgehog), "Antarctica-turntick", getTeamValue(GetHogTeamName(CurrentHedgehog), "Antarctica-turntick")+1)
+				
+			elseif(continent[GetHogTeamName(CurrentHedgehog)]==5)
+			then
+				AddAmmo(CurrentHedgehog,amParachute)
+			end
 		end
 	end
-	
-	if(continent[GetHogTeamName(CurrentHedgehog)]==7)
-	then
-		AddAmmo(CurrentHedgehog,amPortalGun,0)
-		AddAmmo(CurrentHedgehog,amPortalGun,1)
-	elseif(continent[GetHogTeamName(CurrentHedgehog)]==5)
-	then
-		AddAmmo(CurrentHedgehog,amParachute,0)
-		AddAmmo(CurrentHedgehog,amParachute,1)
-	end
-	
-	temp_val=true
-	runOnGears(get_random_weapon)
-	
-	if(temp_val==true and continent[GetHogTeamName(CurrentHedgehog)]==9 and getTeamValue(GetHogTeamName(CurrentHedgehog), "rand-done-turn")==true)
-	then
-		setTeamValue(GetHogTeamName(CurrentHedgehog), "rand-done-turn", false)
-	end
-
 end
 
 --what happens when you press "tab" (common button)
@@ -645,7 +716,7 @@
 		end
 	end
 	
-	--north america
+	--north america (sniper)
 	if(GetCurAmmoType() == amSniperRifle and sniper_s_in_use==false)
 	then
 		if(namericanSpecial==3)
@@ -663,6 +734,7 @@
 		end
 	end
 	
+	--north america (shotgun)
 	if(GetCurAmmoType() == amShotgun and shotgun_s~=nil)
 	then
 		if(shotgun_s==false)
@@ -675,6 +747,7 @@
 		end
 	end
 	
+	--europe
 	if(GetCurAmmoType() == amMolotov)
 	then
 		if(europe_s==0)
@@ -687,45 +760,52 @@
 		end
 	end
 	
-	if(swapweps==true and GetCurAmmoType() == amSkip)
+	--swap forward in the weaponmenu (1.0 style)
+	if(swapweps==true and (GetCurAmmoType() == amSkip or GetCurAmmoType() == amNothing))
 	then
 		continent[GetHogTeamName(CurrentHedgehog)]=continent[GetHogTeamName(CurrentHedgehog)]+1
 		
-		if(continent[GetHogTeamName(CurrentHedgehog)]> table.getn(weaponsets))
+		if(continent[GetHogTeamName(CurrentHedgehog)]> table.maxn(weaponsets))
 		then
 			continent[GetHogTeamName(CurrentHedgehog)]=1
 		end
-		setweapons(true)
+		setweapons()
 	end
 	
-	if(GetCurAmmoType() == amStructure)
+	--kerguelen
+	if(GetCurAmmoType() == amHammer)
 	then
-		if(kergulenSpecial==5)
+		if(kergulenSpecial==6)
 		then
 			kergulenSpecial = 1
-			AddCaption("#"..weapontexts[7])
-		elseif(kergulenSpecial==1 and TotalRounds>=1)
+			AddCaption("Normal")
+		elseif(kergulenSpecial==1)
 		then
 			kergulenSpecial = 2
-			AddCaption("##"..weapontexts[8])
-		elseif(kergulenSpecial==2 or (kergulenSpecial==1 and TotalRounds<1))
+			AddCaption("#"..weapontexts[7])
+		elseif(kergulenSpecial==2 and TotalRounds>=1)
 		then
 			kergulenSpecial = 3
-			AddCaption("###"..weapontexts[9])
-		elseif(kergulenSpecial==3)
+			AddCaption("##"..weapontexts[8])
+		elseif(kergulenSpecial==3 or (kergulenSpecial==2 and TotalRounds<1))
 		then
 			kergulenSpecial = 4
-			AddCaption("####"..weapontexts[10])
+			AddCaption("###"..weapontexts[9])
 		elseif(kergulenSpecial==4)
 		then
 			kergulenSpecial = 5
+			AddCaption("####"..weapontexts[10])
+		elseif(kergulenSpecial==5)
+		then
+			kergulenSpecial = 6
 			AddCaption("#####"..weapontexts[15])
 		end
 	end
 end
 
 function onPrecise()
-	if(swapweps==true and GetCurAmmoType() == amSkip)
+	--swap backwards in the weaponmenu (1.0 style)
+	if(swapweps==true and (GetCurAmmoType() == amSkip or GetCurAmmoType() == amNothing))
 	then
 		continent[GetHogTeamName(CurrentHedgehog)]=continent[GetHogTeamName(CurrentHedgehog)]-1
 		
@@ -733,98 +813,55 @@
 		then
 			continent[GetHogTeamName(CurrentHedgehog)]=9
 		end
-		setweapons(true)
-	end
-end
-
-function onSlot()
-	if(continent[GetHogTeamName(CurrentHedgehog)]==0) then
-		ParseCommand("setweap " .. string.char(amSkip))
+		setweapons()
 	end
 end
 
 function onGameTick20()
-
-	if(teams_ok[GetHogTeamName(CurrentHedgehog)] == 2)
+	--if you picked a weaponset from the weaponmenu (icon)
+	if(continent[GetHogTeamName(CurrentHedgehog)]==0)
 	then
-		if(GetCurAmmoType()~=amTeleport and swapweps==true and TurnTime-TurnTimeLeft>=100)
+		if(GetCurAmmoType()==amSwitch)
 		then
-			teams_ok[GetHogTeamName(CurrentHedgehog)] = true
-			ParseCommand("setweap " .. string.char(amSkip))
+			continent[GetHogTeamName(CurrentHedgehog)]=GetRandom(table.maxn(weaponsets))+1
+			setweapons()
+			PlaySound(sndMineTick)
+		else
+			for v,w in pairs(weaponsets) 
+			do
+				if(GetCurAmmoType()==weaponsets[v][4])
+				then
+					continent[GetHogTeamName(CurrentHedgehog)]=v
+					setweapons()
+					PlaySound(weaponsetssounds[v][1])
+					PlaySound(weaponsetssounds[v][2],CurrentHedgehog)
+				end
+			end
 		end
 	end
 	
-	if(continent[GetHogTeamName(CurrentHedgehog)]==0)
+	--show the kerguelen ring
+	if(kergulenSpecial > 1 and GetCurAmmoType() == amHammer)
 	then
-		if(GetCurAmmoType()==amSniperRifle) then
-			continent[GetHogTeamName(CurrentHedgehog)]=1
-			setweapons(false)
-		elseif(GetCurAmmoType()==amGasBomb) then
-			continent[GetHogTeamName(CurrentHedgehog)]=2
-			setweapons(false)
-		elseif(GetCurAmmoType()==amBazooka) then
-			continent[GetHogTeamName(CurrentHedgehog)]=3
-			setweapons(false)
-		elseif(GetCurAmmoType()==amSMine) then
-			continent[GetHogTeamName(CurrentHedgehog)]=4
-			setweapons(false)
-		elseif(GetCurAmmoType()==amRope) then
-			continent[GetHogTeamName(CurrentHedgehog)]=5
-			setweapons(false)
-		elseif(GetCurAmmoType()==amBaseballBat) then
-			continent[GetHogTeamName(CurrentHedgehog)]=6
-			setweapons(false)
-		elseif(GetCurAmmoType()==amTeleport) then
-			continent[GetHogTeamName(CurrentHedgehog)]=7
-			setweapons(false)
-		elseif(GetCurAmmoType()==amStructure) then
-			continent[GetHogTeamName(CurrentHedgehog)]=8
-			setweapons(false)
-		elseif(GetCurAmmoType()==amInvulnerable) then
-			continent[GetHogTeamName(CurrentHedgehog)]=9
-			setweapons(false)
-		elseif(GetCurAmmoType()==amSwitch) then
-			continent[GetHogTeamName(CurrentHedgehog)]=GetRandom(table.getn(weaponsets))+1
-			setweapons(false)
+		if(visualcircle==nil)
+		then
+			visualcircle=AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtCircle, 0, false)
 		end
-	end
-	
-	if(kergulenSpecial ~= 0 and GetCurAmmoType() == amStructure)
-	then
-		if(kergulenSpecial == 1)
+		
+		if(kergulenSpecial == 2) --walrus scream
 		then
-			if(visualcircle==nil)
-			then
-				visualcircle=AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtCircle, 120, false)
-			end
 			SetVisualGearValues(visualcircle, GetX(CurrentHedgehog), GetY(CurrentHedgehog),20, 200, 0, 0, 100, 120, 4, 0xff0000ee)
-		elseif(kergulenSpecial == 2)
+		elseif(kergulenSpecial == 3) --swap hog
 		then
-			if(visualcircle==nil)
-			then
-				visualcircle=AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtCircle, 450, false)
-			end
 			SetVisualGearValues(visualcircle, GetX(CurrentHedgehog), GetY(CurrentHedgehog),20, 200, 0, 0, 100, 450, 3, 0xffff00ee)
-		elseif(kergulenSpecial == 3)
-		then
-			if(visualcircle==nil)
-			then
-				visualcircle=AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtCircle, 45, false)
-			end
-			SetVisualGearValues(visualcircle, GetX(CurrentHedgehog), GetY(CurrentHedgehog),20, 200, 0, 0, 100, 45, 6, 0x00ff00ee)
-		elseif(kergulenSpecial == 4)
+		elseif(kergulenSpecial == 4) --flare
 		then
-			if(visualcircle==nil)
-			then
-				visualcircle=AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtCircle, 500, false)
-			end
+			SetVisualGearValues(visualcircle, GetX(CurrentHedgehog), GetY(CurrentHedgehog),20, 200, 0, 0, 100, 45, 6, 0x00ff00ee)
+		elseif(kergulenSpecial == 5) --cries
+		then
 			SetVisualGearValues(visualcircle, GetX(CurrentHedgehog), GetY(CurrentHedgehog),20, 200, 0, 0, 100, 500, 1, 0x0000ffee)
-		elseif(kergulenSpecial == 5)
+		elseif(kergulenSpecial == 6) --sabotage
 		then
-			if(visualcircle==nil)
-			then
-				visualcircle=AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtCircle, 100, false)
-			end
 			SetVisualGearValues(visualcircle, GetX(CurrentHedgehog), GetY(CurrentHedgehog),20, 200, 0, 0, 100, 100, 10, 0xeeeeeeee)
 		end
 	
@@ -834,21 +871,25 @@
 		visualcircle=nil
 	end
 	
+	--sabotage
 	if(disable_moving[CurrentHedgehog]==true)
 	then
 	
 		if(TurnTimeLeft<=150)
 		then
 			disable_moving[CurrentHedgehog]=false
-			SetHogLevel(CurrentHedgehog,0)
+			SetHogLevel(CurrentHedgehog,disableoffsetai)
+			onsabotageai=false
 		elseif(disallowattack>=15 and disallowattack >= 20)
 		then
 			disallowattack=0
+			onsabotageai=true
 			SetHogLevel(CurrentHedgehog,1)
 			AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtSmokeWhite, 0, false)
-		elseif(GetHogLevel(CurrentHedgehog)==1)
+		elseif(onsabotageai==true)
 		then
-			SetHogLevel(CurrentHedgehog,0)
+			SetHogLevel(CurrentHedgehog,disableoffsetai)
+			onsabotageai=false
 		else
 			disallowattack=disallowattack+1
 		end
@@ -860,43 +901,48 @@
 --if you used hogswitch or any similar weapon, dont enable any weaponchange
 function onAttack()
 	swapweps=false
-	local around=false
 	
 	--african special
 	if(africanSpecial == 1 and GetCurAmmoType() == amSeduction)
 	then
 		SetState(CurrentHedgehog, gstAttacked)
 		
+		temp_val=0
 		runOnGears(weapon_duststorm)
+		SetHealth(CurrentHedgehog, GetHealth(CurrentHedgehog)+temp_val)
 
 		--visual stuff
 		visual_gear_explosion(250,GetX(CurrentHedgehog), GetY(CurrentHedgehog),vgtSmoke,vgtSmokeWhite)
 		PlaySound(sndParachute)
-	end
-	
+
 	--Kerguelen specials
-	if(GetCurAmmoType() == amStructure)
+	elseif(GetCurAmmoType() == amHammer and kergulenSpecial > 1)
 	then
 		SetState(CurrentHedgehog, gstAttacked)
-		if(kergulenSpecial == 1)
+		--scream
+		if(kergulenSpecial == 2)
 		then
 			temp_val=0
 			runOnGears(weapon_scream_walrus)
 			SetHealth(CurrentHedgehog, GetHealth(CurrentHedgehog)+temp_val)
 			PlaySound(sndHellish)
-			
-		elseif(kergulenSpecial == 2 and TotalRounds>=1)
+		
+		--swap
+		elseif(kergulenSpecial == 3 and TotalRounds>=1)
 		then
 			runOnGears(weapon_swap_kerg)
 			PlaySound(sndPiano3)
-		elseif(kergulenSpecial == 3)
+			
+		--flare
+		elseif(kergulenSpecial == 4)
 		then
 			runOnGears(weapon_flare)
 			PlaySound(sndThrowRelease)
 			AddVisualGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog), vgtSmokeWhite, 0, false)
-			AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog)-20, gtCluster, 0, 0, -1000000, 30)
-				
-		elseif(kergulenSpecial == 4)
+			AddGear(GetX(CurrentHedgehog), GetY(CurrentHedgehog)-20, gtCluster, 0, 0, -1000000, 34)
+		
+		--cries
+		elseif(kergulenSpecial == 5)
 		then
 			runOnGears(weapon_cries_a)
 			if(kergulenSpecial~=-1)
@@ -905,18 +951,25 @@
 				PlaySound(sndWarp)
 				PlaySound(sndMolotov)
 				
+				temp_val=0
 				runOnGears(weapon_cries_b)
+				SetHealth(CurrentHedgehog, GetHealth(CurrentHedgehog)+temp_val)
 			else
 				HogSay(CurrentHedgehog, loc("Hogs in sight!"), SAY_SAY)
 			end
-		elseif(kergulenSpecial == 5)
+		
+		--sabotage
+		elseif(kergulenSpecial == 6)
 		then
 			runOnGears(weapon_sabotage)
 		end
 		DeleteVisualGear(visualcircle)
 		visualcircle=nil
+		
+	elseif(GetCurAmmoType() == amVampiric)
+	then
+		VampOn=75
 	end
-
 	--Australian special
 	if(GetGearType(austmine) == gtMine and austmine ~= nil)
 	then
@@ -933,10 +986,12 @@
 		austmine=nil
 	end
 	
+	--stop sabotage (avoiding a bug)
 	if(disable_moving[CurrentHedgehog]==true)
 	then
 		disable_moving[CurrentHedgehog]=false
-		SetHogLevel(CurrentHedgehog,0)
+		onsabotageai=false
+		SetHogLevel(CurrentHedgehog,disableoffsetai)
 	end
 	
 	australianSpecial=false
@@ -945,6 +1000,7 @@
 function onGearAdd(gearUid)
 	swapweps=false
 	
+	--track the gears im using
 	if(GetGearType(gearUid) == gtHedgehog or GetGearType(gearUid) == gtMine or GetGearType(gearUid) == gtExplosives) 
 	then
 		trackGear(gearUid)
@@ -1010,7 +1066,8 @@
 	then
 		trackDeletion(gearUid)
 	end
-	--north american specials
+	
+	--north american lipstick
 	if(GetGearType(gearUid)==gtSniperRifleShot )
 	then
 		sniper_s_in_use=false
@@ -1027,10 +1084,12 @@
 			SetGearMessage(pinata,1)
 		end
 		
+	--north american pinata
 	elseif(GetGearType(gearUid)==gtCluster and GetGearMessage(gearUid)==1 and namericanSpecial==3)
 	then
 		AddGear(GetX(gearUid), GetY(gearUid), gtCluster, 0, 0, 0, 20)
 	
+	--north american eagle eye
 	elseif(GetGearType(gearUid)==gtShotgunShot and shotgun_s==true)
 	then
 		SetState(CurrentHedgehog, gstMoving)
@@ -1043,11 +1102,13 @@
 		temp_val=gearUid
 		runOnGears(weapon_anno_south)
 		AddVisualGear(GetX(gearUid), GetY(gearUid), vgtExplosion, 0, false)
-
+	
+	--asian special
 	elseif(GetGearType(gearUid)==gtSnowball and GetGearMessage(gearUid)==1)
 	then
-		AddGear(GetX(gearUid), GetY(gearUid)+3, gtCluster, 0, 0, 0, 22)
-		
+		AddGear(GetX(gearUid), GetY(gearUid), gtCluster, 0, 0, 0, 22)
+	
+	--europe special
 	elseif(GetGearType(gearUid)==gtCluster and GetGearMessage(gearUid)==2)
 	then
 		temp_val=gearUid
@@ -1055,9 +1116,16 @@
 		visual_gear_explosion(100,GetX(gearUid), GetY(gearUid),vgtSmokeWhite,vgtSmokeWhite)
 		AddVisualGear(GetX(gearUid), GetY(gearUid), vgtExplosion, 0, false)
 		PlaySound(sndGraveImpact)
-		
+	
+	--asia (using para)
 	elseif(GetGearType(gearUid)==gtParachute)
 	then
 		inpara=false
 	end
 end
+--[[
+sources (populations & area):
+Wikipedia
+Own calculations
+if you think they are wrong, then please tell me :)
+]]
\ No newline at end of file