McTowerVfx changes work

Add GCCS gem create coremod Bump version to 1.0.0 for RELEASE
piepie62 · Oct 12, 2022 · a6e2d6a · a6e2d6a
1 parent 2be2a76
commit a6e2d6a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/src/gemshapesplus/GemShapesPlusCoreMod.as b/src/gemshapesplus/GemShapesPlusCoreMod.as
@@ -9,7 +9,7 @@ package gemshapesplus
 	 */
 	public class GemShapesPlusCoreMod 
 	{
-		internal static const VERSION:String = "3";
+		internal static const VERSION:String = "4";
 		internal static function installCoremods(lattice:Lattice):void
 		{
 			if (lattice.doesFileExist("com/giab/games/gcfw/Main.class.asasm"))
@@ -22,9 +22,29 @@ package gemshapesplus
 			{
 				GemShapesPlusMod.logger.log("installCoremods", "Found GCCS, installing coremod");
 				installVfxCoremod(lattice, "gccs/steam");
+				installGCCSToolTipCoremod(lattice);
 				installNumberCoremod(lattice, "gccs/steam");
 			}
 		}
+
+		private static function installGCCSToolTipCoremod(lattice:Lattice):void
+		{
+			var filename:String = "com/giab/games/gccs/steam/ingame/IngameInfoPanelRenderer.class.asasm";
+			var offset:int = lattice.findPattern(filename, /findpropstrict.*"McGem"/);
+			offset += 3;
+			lattice.patchFile(filename, offset, 0, ' \
+				getlex QName(PackageNamespace("com.giab.games.gccs.steam"), "GV") \n \
+				getproperty QName(PackageNamespace(""), "main") \n \
+				getproperty QName(PackageNamespace(""), "bezel") \n \
+				pushstring "Gem Shapes Plus" \n \
+				callproperty QName(PackageNamespace(""), "getModByName"), 1 \n \
+				getproperty QName(PackageNamespace(""), "loaderInfo") \n \
+				getproperty QName(PackageNamespace(""), "applicationDomain") \n \
+				pushstring "gemshapesplus.gccs.steam.ShapeAdder" \n \
+				callproperty QName(PackageNamespace(""), "getDefinition"), 1 \n \
+				getlocal 5 \n \
+				callpropvoid QName(PackageNamespace(""), "addShapes"), 1');
+		}
 
 		private static function installVfxCoremod(lattice:Lattice, baseGame:String):void
 		{

diff --git a/src/gemshapesplus/GemShapesPlusMod.as b/src/gemshapesplus/GemShapesPlusMod.as
@@ -15,8 +15,8 @@ package gemshapesplus
 	 */
 	public class GemShapesPlusMod extends MovieClip implements BezelCoreMod 
 	{
-		public function get BEZEL_VERSION():String { return "2.0.0"; }
-		public function get VERSION():String { return "0.0.1"; }
+		public function get BEZEL_VERSION():String { return "2.0.4"; }
+		public function get VERSION():String { return "1.0.0"; }
 		public function get MOD_NAME():String { return "Gem Shapes Plus"; }
 		public function get COREMOD_VERSION():String { return GemShapesPlusCoreMod.VERSION; }
 
@@ -56,9 +56,15 @@ package gemshapesplus
 		public static const MAX_EXTRA_GRADE:int = 40;
 
 		CONFIG::release
-		public static const GRADE_ORDER:Vector.<int> = new <int>[1,25,31,18,2,24,7,4,26,38,14,35,6,19,5,29,3,28,36,17,40,33,23,27,11,34,39,21,22,32,10,8,9,20,16,13,37,30,15,12];
+		public static const GRADE_ORDER:Vector.<int> = new <int>[1,25,31,18,2,24,7,4,26,38,
+																 14,35,6,19,5,29,3,28,36,17,
+																 40,33,23,27,11,34,39,21,22,32,
+																 10,8,9,20,16,13,37,30,15,12];
 		CONFIG::debug
-		public static const GRADE_ORDER:Vector.<int> = new <int>[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40];
+		public static const GRADE_ORDER:Vector.<int> = new <int>[1,2,3,4,5,6,7,8,9,10,
+																 11,12,13,14,15,16,17,18,19,20,
+																 21,22,23,24,25,26,27,28,29,30,
+																 31,32,33,34,35,36,37,38,39,40];
 
 		public function GemShapesPlusMod()
 		{

diff --git a/src/gemshapesplus/gccs/steam/ShapeAdder.as b/src/gemshapesplus/gccs/steam/ShapeAdder.as
@@ -56,7 +56,6 @@ package gemshapesplus.gccs.steam
 		public static function addVfxShapes(o:Object):void
 		{
 			var mc:McVfxTowerShotGlare = o as McVfxTowerShotGlare;
-			// TODO: Figure out why this doesn't work and how to fix it
 			var rect:Rectangle = mc.getRect(mc);
 			var origWidth:Number = mc.width, origHeight:Number = mc.height;
 			var origScaleX:Number = mc.scaleX, origScaleY:Number = mc.scaleY;

diff --git a/src/gemshapesplus/gcfw/ShapeAdder.as b/src/gemshapesplus/gcfw/ShapeAdder.as
@@ -58,7 +58,6 @@ package gemshapesplus.gcfw
 		public static function addVfxShapes(o:Object):void
 		{
 			var mc:McVfxTowerShotGlare = o as McVfxTowerShotGlare;
-			// TODO: Figure out why this doesn't work and how to fix it
 			var rect:Rectangle = mc.getRect(mc);
 			var origWidth:Number = mc.width, origHeight:Number = mc.height;
 			var origScaleX:Number = mc.scaleX, origScaleY:Number = mc.scaleY;

diff --git a/src/gemshapesplus/shapemodifiers/ReplacementBlackLayer.as b/src/gemshapesplus/shapemodifiers/ReplacementBlackLayer.as
@@ -3,7 +3,6 @@ package gemshapesplus.shapemodifiers
 	import flash.display.DisplayObject;
 	import flash.display.MovieClip;
 	import flash.display.Shape;
-	import flash.display.Sprite;
 	import flash.geom.ColorTransform;
 	import flash.geom.Rectangle;
 	import gemshapesplus.GemShapesPlusMod;

diff --git a/src/gemshapesplus/shapemodifiers/ReplacementGlare.as b/src/gemshapesplus/shapemodifiers/ReplacementGlare.as
@@ -7,12 +7,10 @@ package gemshapesplus.shapemodifiers
 	import flash.display.IGraphicsData;
 	import flash.display.MovieClip;
 	import flash.display.Shape;
-	import flash.display.Sprite;
 	import flash.geom.Matrix;
 	import flash.geom.Point;
 	import flash.geom.Rectangle;
 	import gemshapesplus.GemShapesPlusMod;
-	import flash.utils.getQualifiedClassName;
 	/**
 	 * ...
 	 * @author Chris