Merge pull request #89 from Ormael7/master-wip

0.8l2

Corruption-of-Champions-FD-STANDALONE.as3proj

@@ -4,7 +4,7 @@
   <output>
     <movie outputType="Application" />
     <movie input="" />
-    <movie path="..\..\Desktop\CoC_Xianxia_0.8l.swf" />
+    <movie path="..\..\Desktop\CoC_Xianxia_0.8l2.swf" />
     <movie fps="24" />
     <movie width="1000" />
     <movie height="800" />

classes/classes/BaseContent.as

@@ -41,6 +41,10 @@ import coc.xxc.StoryContext;
 		{
 			EventParser.cheatTime(time, needNext);
 		}
+		protected function cheatTime2(time:Number, needNext:Boolean = false):void
+		{
+			EventParser.cheatTime2(time, needNext);
+		}
 		/*protected function incrementDay(time:Number):void
 		{
 			CoC.instance.incrementDay(time);

classes/classes/CoC.as

@@ -249,8 +249,8 @@ public class CoC extends MovieClip
         //model.debug = debug; // TODO: Set on model?
 
 			//Version NUMBER
-			ver = "1.0.2_mod_Xianxia_0.8l";
-			version = ver + " (<b>New Lunar Year mini-event + pig/boar/elf TF's rework, orc + displacer beast TF, 2 new areas + new enemies, Job: Gunslinger perk line, Perk-o-calipse 4 (77 perks), Achiev-o-calipse (over 70 new achievs), The Unicorn Daughter Strikes Back (Yes Celess is Back)</b>)";
+			ver = "1.0.2_mod_Xianxia_0.8l2";
+			version = ver + " (<b>Bugfixes + missing content that not make in time for previous version</b>)";
 
         this.images = new ImageManager(stage, mainView);
         this.inputManager = new InputManager(stage, mainView, false);

classes/classes/Creature.as

@@ -2568,6 +2568,7 @@ public class Creature extends Utils
 
 		public static const canPounceArms:Array = [
 			Arms.CAT,
+			Arms.DISPLACER,
 			Arms.LION,
 			Arms.SPHINX,
 			Arms.WOLF,

classes/classes/EngineCore.as

@@ -833,7 +833,6 @@ public class EngineCore {
             trace("Do next setup cancelled by game over");
             return;
         }
-
         //trace("DoNext have item:", eventNo);
         //choices("Next", event, "", 0, "", 0, "", 0, "", 0, "", 0, "", 0, "", 0, "", 0, "", 0);
         menu();

classes/classes/Items/ArmorLib.as

@@ -23,6 +23,8 @@ package classes.Items
 		public const BEEARMR:Armor = new BeeArmor();
 		public const BIMBOSK:ArmorWithPerk = new ArmorWithPerk("BimboSk","BimboSk","bimbo skirt","a skirt that looks like it belongs on a bimbo",1,0,40,"A tight, cleavage-inducing halter top and an extremely short miniskirt.  The sexual allure of this item is undoubtable.","Light",
 				PerkLib.SluttySeduction,10,0,0,0,"Your delightfully slutty yet upbeat garb helps you seduce your foes!", false, false);
+		public const BLKIMONO:ArmorWithPerk = new ArmorWithPerk("Bl.Kimono","Bl.Kimono","black kimono","a black kimono",0,1,200,"This lovely black kimono is adorned with a red floral pattern. It will likely increase your spiritual power as a kitsune.","Light",
+				PerkLib.WizardsAndDaoistsEndurance,20,20,0,0);
 		public const BKIMONO:ArmorWithPerk = new ArmorWithPerk("B.Kimono","B.Kimono","blue kimono","a blue kimono",0,1,200,"This lovely blue kimono is adorned with a floral pattern. It will likely increase your spiritual power as a kitsune.","Light",
 				PerkLib.WizardsAndDaoistsEndurance,20,20,0,0);
 		public const BONSTRP:ArmorWithPerk = new ArmorWithPerk("BonStrp","BonStrp","barely-decent bondage straps","a set of bondage straps",0,0,40,"These leather straps and well-placed hooks are actually designed in such a way as to be worn as clothing.  While they technically would cover your naughty bits, virtually every other inch of your body would be exposed.","Light",

classes/classes/Items/Mutations.as

@@ -7726,8 +7726,8 @@ public final class Mutations extends MutationsHelper
 				if (player.balls == 0) outputText("  Two rounded orbs drop down below, filling out a new, fleshy sac above your [legs].  Sweet!  You can probably cum buckets with balls like these.");
 				outputText("\n\n");
 				player.createCock();
-				player.cocks[0].cockLength = 12;
-				player.cocks[0].cockThickness = 2.75;
+				player.cocks[0].cockLength = 10;
+				player.cocks[0].cockThickness = 2;
 				if (player.balls == 0) {
 					player.balls = 2;
 					player.ballSize = 3;

classes/classes/Player.as

@@ -420,14 +420,14 @@ use namespace CoC;
 			if (skin.hasBaseOnly(Skin.STONE)) armorDef += (10 * newGamePlusMod);
 			//'Thick' dermis descriptor adds 1!
 			if (skinAdj == "smooth") armorDef += (1 * newGamePlusMod);
-			//Plant score bonuses
+			//Plant races score bonuses
 			if (plantScore() >= 4) {
 				if (plantScore() >= 7) armorDef += (10 * newGamePlusMod);
 				else if (plantScore() == 6) armorDef += (8 * newGamePlusMod);
 				else if (plantScore() == 5) armorDef += (4 * newGamePlusMod);
 				else armorDef += (2 * newGamePlusMod);
 			}
-			if (yggdrasilScore() >= 10) armorDef += (10 * newGamePlusMod);
+			if (yggdrasilScore() >= 10 || alrauneScore() >= 10) armorDef += (10 * newGamePlusMod);
 			//Dragon score bonuses
 			if (dragonScore() >= 10) {
 				if (dragonScore() >= 28) armorDef += (10 * newGamePlusMod);
@@ -702,8 +702,8 @@ use namespace CoC;
 		//Natural Claws (arm types and weapons that can substitude them)
 		public function haveNaturalClaws():Boolean
 		{
-			return arms.type == Arms.CAT || arms.type == Arms.DEVIL || arms.type == Arms.DRAGON || arms.type == Arms.FOX || arms.type == Arms.GARGOYLE || arms.type == Arms.LION || arms.type == Arms.LIZARD || arms.type == Arms.RAIJU
-			 || arms.type == Arms.RED_PANDA || arms.type == Arms.SALAMANDER || arms.type == Arms.WOLF;
+			return arms.type == Arms.CAT || arms.type == Arms.DEVIL || arms.type == Arms.DISPLACER || arms.type == Arms.DRAGON || arms.type == Arms.FOX || arms.type == Arms.GARGOYLE || arms.type == Arms.LION
+			 || arms.type == Arms.LIZARD || arms.type == Arms.RAIJU || arms.type == Arms.RED_PANDA || arms.type == Arms.SALAMANDER || arms.type == Arms.WOLF;
 		}
 		public function haveNaturalClawsTypeWeapon():Boolean
 		{
@@ -1319,6 +1319,13 @@ use namespace CoC;
 			if(findPerk(PerkLib.ResistanceIV) >= 0) lust -= 5;
 			if(findPerk(PerkLib.ResistanceV) >= 0) lust -= 5;
 			if(findPerk(PerkLib.ResistanceVI) >= 0) lust -= 5;
+			if(findPerk(PerkLib.PewWarmer) >= 0) lust -= 5;
+			if(findPerk(PerkLib.Acolyte) >= 0) lust -= 5;
+			if(findPerk(PerkLib.Priest) >= 0) lust -= 5;
+			if(findPerk(PerkLib.Pastor) >= 0) lust -= 5;
+			if(findPerk(PerkLib.Saint) >= 0) lust -= 5;
+			if(findPerk(PerkLib.Cardinal) >= 0) lust -= 5;
+			if(findPerk(PerkLib.Pope) >= 0) lust -= 5;
 			if(findPerk(PerkLib.LactaBovinaOvariesEvolved) >= 0) lust -= 5;
 			if(findPerk(PerkLib.MinotaurTesticlesEvolved) >= 0) lust -= 5;
 			if((findPerk(PerkLib.UnicornBlessing) >= 0 && cor <= 20) || (findPerk(PerkLib.BicornBlessing) >= 0 && cor >= 80)) lust -= 10;
@@ -6714,6 +6721,27 @@ use namespace CoC;
 			if (this.findPerk(PerkLib.HistoryReligious) >= 0 || this.findPerk(PerkLib.PastLifeReligious) >= 0) {
 				minLib -= 2;
 			}
+			if (this.findPerk(PerkLib.PewWarmer) >= 0) {
+				minLib -= 2;
+			}
+			if (this.findPerk(PerkLib.Acolyte) >= 0) {
+				minLib -= 2;
+			}
+			if (this.findPerk(PerkLib.Priest) >= 0) {
+				minLib -= 2;
+			}
+			if (this.findPerk(PerkLib.Pastor) >= 0) {
+				minLib -= 2;
+			}
+			if (this.findPerk(PerkLib.Saint) >= 0) {
+				minLib -= 2;
+			}
+			if (this.findPerk(PerkLib.Cardinal) >= 0) {
+				minLib -= 2;
+			}
+			if (this.findPerk(PerkLib.Pope) >= 0) {
+				minLib -= 2;
+			}
 			if (this.findPerk(PerkLib.GargoylePure) >= 0) {
 				minLib = 5;
 				minSen = 5;
@@ -6722,21 +6750,20 @@ use namespace CoC;
 				minSen += 15;
 			}
 			//Factory Perks
-			if(this.hasPerk(PerkLib.DemonicLethicite)) {minCor+=10;minLib+=10;}
-			if(this.hasPerk(PerkLib.ProductivityDrugs)) {minLib+=this.perkv1(PerkLib.ProductivityDrugs);minCor+=10;}
-
+			if (this.hasPerk(PerkLib.DemonicLethicite)) {minCor+=10;minLib+=10;}
+			if (this.hasPerk(PerkLib.ProductivityDrugs)) {minLib+=this.perkv1(PerkLib.ProductivityDrugs);minCor+=10;}
 			//Minimum Sensitivity
-			if(this.manticoreScore() >= 6) minSen += (30 * newGamePlusMod);
-			if(this.manticoreScore() >= 12) minSen += (15 * newGamePlusMod);
-			if(this.devilkinScore() >= 7) minSen += (10 * newGamePlusMod);
-			if(this.devilkinScore() >= 11) minSen += (15 * newGamePlusMod);
-			if(this.devilkinScore() >= 14) minSen += (30 * newGamePlusMod);
-			if(this.elfScore() >= 5) minSen += (15 * newGamePlusMod);
-			if(this.elfScore() >= 11) minSen += (15 * newGamePlusMod);
-			if(this.raijuScore() >= 5) minSen += (25 * newGamePlusMod);
-			if(this.raijuScore() >= 10) minSen += (25 * newGamePlusMod);
-			if(this.hellcatScore() >= 10) minSen += (25 * newGamePlusMod);
-
+			if (this.manticoreScore() >= 6) minSen += (30 * newGamePlusMod);
+			if (this.manticoreScore() >= 12) minSen += (15 * newGamePlusMod);
+			if (this.devilkinScore() >= 7) minSen += (10 * newGamePlusMod);
+			if (this.devilkinScore() >= 11) minSen += (15 * newGamePlusMod);
+			if (this.devilkinScore() >= 14) minSen += (30 * newGamePlusMod);
+			if (this.elfScore() >= 5) minSen += (15 * newGamePlusMod);
+			if (this.elfScore() >= 11) minSen += (15 * newGamePlusMod);
+			if (this.raijuScore() >= 5) minSen += (25 * newGamePlusMod);
+			if (this.raijuScore() >= 10) minSen += (25 * newGamePlusMod);
+			if (this.hellcatScore() >= 10) minSen += (25 * newGamePlusMod);
+			if (minLib < 1) minLib = 1;
 			return {
 				str:minStr,
 				tou:minTou,

classes/classes/PlayerEvents.as

@@ -1752,7 +1752,7 @@ if (CoC.instance.model.time.hours > 23) { //Once per day
 					flags[kFLAGS.SOUL_SENSE_WORLD_TREE] = 1;
 					EngineCore.doNext(playerMenu);
 					return true;
-				}
+				}/*
 				if (player.hasKeyItem("Jade Talisman") >= 0 && flags[kFLAGS.AURORA_LVL] < 1) {
 					outputText("\nYou have weird dream tonight. In that dream you’re back in the Hidden Cave, exploring it room after room, smashing to pieces any of the golems or small bat golems you find and looting the treasures. Then you face the dragon-boy in short, but intensive fight, ending with him running away like coward, while still having enough courage to leave some witty remarks.");
 					outputText("\n\nMaking sure you not overlooked any valuable items you walk slowly toward stairway leading to first floor when... your gaze stops on one of walls in the room with the stairway. Compared to other nearby walls which are all without any damage or otherwise imperfections you spot on this particular wall something. Something like a crack or...keyhole? Intrigued you start to walk toward it...");
@@ -1761,7 +1761,7 @@ if (CoC.instance.model.time.hours > 23) { //Once per day
 					flags[kFLAGS.AURORA_LVL] = 1;
 					EngineCore.doNext(playerMenu);
 					return true;
-				}
+				}*/
 				if (player.lib > 50 || player.lust > 40) { //Randomly generated dreams here
 					if (dreams.dreamSelect()) return true;
 				}

classes/classes/PlayerInfo.as

@@ -504,7 +504,11 @@ public class PlayerInfo extends BaseContent {
 
 		if (flags[kFLAGS.CHI_CHI_AFFECTION] > 0) {
 			interpersonStats += "<b>Chi Chi Affection:</b> " + Math.round(flags[kFLAGS.CHI_CHI_AFFECTION]) + "%\n";
-			if (flags[kFLAGS.CHI_CHI_FOLLOWER] == 3) {
+			if (flags[kFLAGS.CHI_CHI_FOLLOWER] == 4) interpersonStats += "<b>Chi Chi status:</b> Wife\n";
+			if (flags[kFLAGS.CHI_CHI_FOLLOWER] == 3) interpersonStats += "<b>Chi Chi status:</b> Lover\n";
+			if (flags[kFLAGS.CHI_CHI_FOLLOWER] == 2) interpersonStats += "<b>Chi Chi status:</b> <font color=\"#800000\">Dead</font>\n";
+			if (flags[kFLAGS.CHI_CHI_FOLLOWER] < 2) interpersonStats += "<b>Chi Chi status:</b> Apprentice\n";
+			if (flags[kFLAGS.CHI_CHI_FOLLOWER] >= 3) {
 				if (flags[kFLAGS.CHI_CHI_LVL_UP] == 8) interpersonStats += "<b>Chi Chi lvl:</b> 76\n";
 				if (flags[kFLAGS.CHI_CHI_LVL_UP] == 7) interpersonStats += "<b>Chi Chi lvl:</b> 70\n";
 				if (flags[kFLAGS.CHI_CHI_LVL_UP] == 6) interpersonStats += "<b>Chi Chi lvl:</b> 64\n";

classes/classes/Scenes/Areas/Caves/DisplacerBeastScene.as

@@ -40,7 +40,7 @@ public function displacerBeastMilkfeeding():void {
 }
 public function displacerBeastDefeat():void {
 	clearOutput();
-	outputText("As you fall defeated by the octopi-cat woman. Her expression change from aggressive to delighted as she strips your gear away. You expect your crotch to get played with but to your surprise, she goes for your [breast] applying her tentacles on them like a pair of suction cups. You gasp in surprise as something not unlike needles somehow enter your nipples doing god knows what inside of your chest which inflate to ");
+	outputText("As you fall defeated by the octopi-cat woman. Her expression change from aggressive to delighted as she strips your gear away. You expect your crotch to get played with but to your surprise, she goes for your [breasts] applying her tentacles on them like a pair of suction cups. You gasp in surprise as something not unlike needles somehow enter your nipples doing god knows what inside of your chest which inflate to ");
 	if (player.breastRows[0].breastRating < 5) {
 		if (player.breastRows.length == 0) {
 			player.createBreastRow();
@@ -52,7 +52,7 @@ public function displacerBeastDefeat():void {
 	}
 	else player.growTits(2, 1, false, 3);
 	if (player.breastRows[0].lactationMultiplier < 1) player.breastRows[0].lactationMultiplier = 1.25;
-	outputText("[breastcup] cup! You feel sudden dribbles of milk begin to flow out of your overgrown breasts as the tentacles begin to suckle on them and you moan in surprise at this violation!\n\n");
+	outputText(player.breastCup(0) + " cup! You feel sudden dribbles of milk begin to flow out of your overgrown breasts as the tentacles begin to suckle on them and you moan in surprise at this violation!\n\n");
 	outputText("The four-armed catgirl seems to be enjoying herself, mewling as she forcefully sucks your" + (player.breastRows[0].lactationMultiplier == 1.25 ?" newly flowing":"") + " milk out! The feeling in your chest eventually becomes too much for you and you");
 	if (player.hasCock()) {
 		if (player.hasVagina()) outputText("r’e cock and pussy leak fluid");

classes/classes/Scenes/Camp.as

@@ -1693,11 +1693,12 @@ private function campBuildingSim():void {
 	if (player.hasKeyItem("Carpenter's Toolbox") >= 0) {
 		if (flags[kFLAGS.CAMP_WALL_PROGRESS] < 100 && getCampPopulation() >= 4) addButton(0, "Build Wall", buildCampWallPrompt).hint("Build a wall around your camp to defend from the imps." + (flags[kFLAGS.CAMP_WALL_PROGRESS] >= 10 ? "\n\nProgress: " + (flags[kFLAGS.CAMP_WALL_PROGRESS]/10) + "/10 complete": "") + "");
 		if (flags[kFLAGS.CAMP_WALL_PROGRESS] >= 100 && flags[kFLAGS.CAMP_WALL_GATE] <= 0) addButton(0, "Build Gate", buildCampGatePrompt).hint("Build a gate to complete your camp defense.");
-		addButton(3, "Build Cabin(O)", campUpgrades.buildCampMembersCabinsMenu).hint("Work on your camp members cabins.");
-		addButton(5, "Build Misc", campUpgrades.buildmiscMenu).hint("Build other structures than walls or cabins for your camp.");
+		//addButton(2, "Build Cabin(O)", campUpgrades.buildCampMembersCabinsMenu).hint("Work on your camp members cabins.");
+		addButton(5, "Build Misc", campUpgrades.buildmisc1Menu).hint("Build other structures than walls or cabins for your camp.");
+		//addButton(6, "Build Misc(O)", campUpgrades.).hint("Other structures than walls or cabins for your camp.");
 	}
-	if (flags[kFLAGS.CAMP_WALL_PROGRESS] >= 10 && player.hasItem(useables.IMPSKLL, 1)) addButton(1, "AddImpSkull", promptHangImpSkull).hint("Add an imp skull to decorate the wall and to serve as deterrent for imps.", "Add Imp Skull");
-	if (flags[kFLAGS.CAMP_CABIN_PROGRESS] > 0 && flags[kFLAGS.CAMP_CABIN_PROGRESS] < 10) addButton(2, "Build Cabin", cabinProgress.initiateCabin).hint("Work on your cabin."); //Work on cabin.
+	if (flags[kFLAGS.CAMP_CABIN_PROGRESS] > 0 && flags[kFLAGS.CAMP_CABIN_PROGRESS] < 10) addButton(1, "Build Cabin", cabinProgress.initiateCabin).hint("Work on your cabin."); //Work on cabin.
+	if (flags[kFLAGS.CAMP_WALL_PROGRESS] >= 10 && player.hasItem(useables.IMPSKLL, 1)) addButton(10, "AddImpSkull", promptHangImpSkull).hint("Add an imp skull to decorate the wall and to serve as deterrent for imps.", "Add Imp Skull");
 	addButton(14, "Back", campActions);
 }
 
@@ -3027,6 +3028,7 @@ private function ascendForReal():void {
 	//Companions
 	performancePoints += companionsCount();
 	if (flags[kFLAGS.CHI_CHI_FOLLOWER] == 2) performancePoints++;
+	if (flags[kFLAGS.PATCHOULI_FOLLOWER] == 3) performancePoints++;
 	if (player.hasStatusEffect(StatusEffects.DianaOff)) performancePoints++;
 	if (player.hasStatusEffect(StatusEffects.DivaOff)) performancePoints++;
 	if (player.hasStatusEffect(StatusEffects.ElectraOff)) performancePoints++;
@@ -3666,7 +3668,7 @@ private function promptSaveUpdate():void {
 	if (flags[kFLAGS.MOD_SAVE_VERSION] == 22) {
 		flags[kFLAGS.MOD_SAVE_VERSION] = 23;
 		clearOutput();
-		outputText("Transcendenting Transcendental Genetic Memory by 50%, Catching Cowardly dragon-boys and refreshing does of Productivity Drugs.");
+		outputText("Transcendenting Transcendental Genetic Memory by 50%, Catching Cowardly dragon-boys and refreshing dose of Productivity Drugs.");
 		if (player.hasPerk(PerkLib.AscensionTranscendentalGeneticMemoryStage1)) player.addStatusValue(StatusEffects.TranscendentalGeneticMemory, 1, 5);
 		if (player.hasPerk(PerkLib.AscensionTranscendentalGeneticMemoryStage2)) player.addStatusValue(StatusEffects.TranscendentalGeneticMemory, 1, 10);
 		if (player.hasPerk(PerkLib.AscensionTranscendentalGeneticMemoryStage3)) player.addStatusValue(StatusEffects.TranscendentalGeneticMemory, 1, 15);

classes/classes/Scenes/Camp/CampUpgrades.as

@@ -89,7 +89,7 @@ flagi na przyszłościowe surowce coby nie zapomnieć iż je już wpisałem do k
 CAMP_CABIN_SAND_RESOURCES
 CAMP_CABIN_CONCRETE_RESOURCES
 */
-public function buildmiscMenu():void {
+public function buildmisc1Menu():void {
 	menu();
 	if (flags[kFLAGS.MATERIALS_STORAGE_UPGRADES] == 1 || flags[kFLAGS.MATERIALS_STORAGE_UPGRADES] == 2) addButton(0, "Wood Storage", materialgatheringstorageupgrade).hint("Build up storage to gather more wood at the camp. (Req. 150 fatigue)");
 	if (flags[kFLAGS.MATERIALS_STORAGE_UPGRADES] == 3) addButton(0, "Stone Storage", materialgatheringstorageupgrade).hint("Build up storage to gather more stones at the camp. (Req. 150 fatigue)");