From c69d1c7fb8bfd2fa87bd9f90930f2a4db828bf16 Mon Sep 17 00:00:00 2001
From: psychonic <skamonkey@gmail.com>
Date: Mon, 27 Jul 2009 13:30:01 -0700
Subject: [PATCH] AoC gamedata updates (bug 3891, r=dvander)

---
 gamedata/core.games/common.games.txt |  2 --
 gamedata/sdktools.games/game.aoc.txt | 30 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/gamedata/core.games/common.games.txt b/gamedata/core.games/common.games.txt
index ea554458..f7d5a839 100644
--- a/gamedata/core.games/common.games.txt
+++ b/gamedata/core.games/common.games.txt
@@ -128,7 +128,6 @@
 			"game"					"synergy"
 			"game"					"left4dead"
 			"game"					"obsidian"
-			"game"					"ageofchivalry"
 		}
 
 		"Keys"
@@ -145,7 +144,6 @@
 			"game"					"tf"
 			"game"					"synergy"
 			"game"					"dod"
-			"game"					"ageofchivalry"
 		}
 		
 		"Keys"
diff --git a/gamedata/sdktools.games/game.aoc.txt b/gamedata/sdktools.games/game.aoc.txt
index a3668064..f50eaea9 100644
--- a/gamedata/sdktools.games/game.aoc.txt
+++ b/gamedata/sdktools.games/game.aoc.txt
@@ -11,35 +11,35 @@
 
 "Games"
 {
-	/* Age of Chivalry */
+	/* Age of Chivalry (CR2) */
 	"ageofchivalry"
 	{
 		"Offsets"
 		{
 			"GiveNamedItem"
 			{
-				"windows"	"351"
-				"linux"		"352"
+				"windows"	"352"
+				"linux"		"353"
 			}
 			"RemovePlayerItem"
 			{
-				"windows"	"239"
-				"linux"		"240"
+				"windows"	"240"
+				"linux"		"241"
 			}
 			"Weapon_GetSlot"
 			{
-				"windows"	"237"
-				"linux"		"238"
+				"windows"	"238"
+				"linux"		"239"
 			}
 			"Ignite"
 			{
-				"windows"	"194"
-				"linux"		"195"
+				"windows"	"195"
+				"linux"		"196"
 			}
 			"Extinguish"
 			{
-				"windows"	"198"
-				"linux"		"199"
+				"windows"	"199"
+				"linux"		"200"
 			}
 			"Teleport"
 			{
@@ -48,8 +48,8 @@
 			}
 			"CommitSuicide"
 			{
-				"windows"	"389"
-				"linux"		"389"
+				"windows"	"390"
+				"linux"		"390"
 			}
 			"GetVelocity"
 			{
@@ -88,8 +88,8 @@
 			}
 			"WeaponEquip"
 			{
-				"windows"	"230"
-				"linux"		"231"
+				"windows"	"231"
+				"linux"		"232"
 			}
 			"Activate"
 			{