Skip to content

Commit

Permalink
Merge pull request #145 from Ormael7/master-wip
Browse files Browse the repository at this point in the history 
Master wip
  • Loading branch information
@Ormael7
Ormael7 authored Apr 15, 2020
2 parents 936a70c + 4a573f2 commit 797cc9e
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 48 deletions.
2 changes: 1 addition & 1 deletion Corruption-of-Champions-FD-STANDALONE.as3proj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<output>
<movie outputType="Application" />
<movie input="" />
<movie path="..\..\Desktop\CoC_Xianxia_0.8n9.swf" />
<movie path="..\..\Desktop\CoC_Xianxia_0.8n10.swf" />
<movie fps="24" />
<movie width="1000" />
<movie height="800" />
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/CoC.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ public class CoC extends MovieClip
//model.debug = debug; // TODO: Set on model?

//Version NUMBER
ver = "1.0.2_mod_Xianxia_0.8n9";
version = ver + " (<b>Orca, Manticore, Bicorn/Unicorn, Cave Wyrm updates; New TF's: Eastern Bunny, Melkie, Centipede, Kasha, Kraken; Warlocks Dark Ritual, new way to determine showed PC race at app screen and many new sprites showing on character viewer (Lia Twist sponsored whole this title)</b>)";
ver = "1.0.2_mod_Xianxia_0.8n10";
version = ver + " (<b>Tiny fix</b>)";

this.images = new ImageManager(stage, mainView);
this.inputManager = new InputManager(stage, mainView, false);
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/Items/Mutations.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7260,7 +7260,7 @@ public final class Mutations extends MutationsHelper
changes++;
outputText("\n\nThere's a tightening in your [sack] that only gets higher and higher until you're doubled over and wheezing. When it passes, you reach down and discover that <b>two of your testicles are gone.</b>");
player.balls -= 2;
}/*
}
//Make PC an Easter bunny
if (!player.hasPerk(PerkLib.EasterBunnyBalls) && player.hasCock() && player.balls <= 4 && rand(3) == 0) {
outputText("\n\nYou gasp as ");
Expand All @@ -7278,7 +7278,7 @@ public final class Mutations extends MutationsHelper
player.createPerk(PerkLib.EasterBunnyBalls, 0, 0, 0, 0);
player.ballSize = 1;
flags[kFLAGS.EASTER_BUNNY_EGGS_STORED] += 2;
}*/
}
//Boost cum production
if ((player.balls > 0 || player.hasCock()) && player.cumQ() < 3000 && rand(3) == 0 && changeLimit > 1) {
changes++;
Expand Down
6 changes: 3 additions & 3 deletions classes/classes/MainMenu.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,11 @@ public class MainMenu extends BaseContent {
outputText("</ul>");
outputText("<b>Supplementary Events:</b>");
outputText("<ul>");
outputText("<li> Liadri (Etna, Manticore Venom (TF item), Black Ink - female scylla TF item, female scylla exclusive masturbation scene, texts and name for Mantis TF - Blade Grass, Kindra (writing part and some of ideas for few secenes), Archery Overhaul (main designer for it), various TF's: Yeti, Orca, Raiju, Manticore, Hinezumi, Alraune, Werewolf, Winter Wolf, Fenrir, Gargoyle, Cheshire Cat, Hellcat, Jabberwock, Cave Wyrm, Devil, Bicorn, Nightmare, Elf; Ceani the Orca girl, Electra the Raiju, Chi Chi the fire mouse, Luna the werewolf maid, Patchouli, Celess, Electra, Winter Wolf enemy, Sabbat event, Pinchou merchant and all items in her shop, Adventure Guild, ");
outputText("underwater sharkgirls sex scenes, Kaiba the tanuki merchant, Den of Desire dungeon, most of writing for 1st floor of River Dungeon, Erma archery training, Gaunlet 1 and 2, Jiangshi TF, part of Michiko)</li>");
outputText("<li> Liadri (Etna, Manticore Venom (TF item), Black Ink - female scylla TF item, female scylla exclusive masturbation scene, texts and name for Mantis TF - Blade Grass, Kindra (writing part and some of ideas for few secenes), Archery Overhaul (main designer for it), various TF's: Yeti, Orca, Raiju, Manticore, Hinezumi, Alraune, Werewolf, Winter Wolf, Fenrir, Gargoyle, Cheshire Cat, Hellcat, Jabberwock, Cave Wyrm, Devil, Bicorn, Nightmare, Elf, Melkie; Ceani the Orca girl, Electra the Raiju, Chi Chi the fire mouse, Luna the werewolf maid, Patchouli, Celess, Electra, Winter Wolf enemy, Sabbat event, Pinchou merchant and all items in her shop, ");
outputText("Adventure Guild, underwater sharkgirls sex scenes, Kaiba the tanuki merchant, Den of Desire dungeon, most of writing for 1st floor of River Dungeon, Erma archery training, Gaunlet 1 and 2, Jiangshi TF, part of Michiko)</li>");
outputText("<li> Zevos (Spider-silk shirt, Dragonscale vest, Eldritch Ribbon, Ascensus, Depravation, Puritas items, Ebonbloom crafting material and all items made from it, Ignis)</li>");
outputText("<li> Coalsack (Anzu the Avian Deity, Arian App desc, option to change his/her scales color)</li>");
outputText("<li> Lord Snakebite (part of Ghost TF rework)</li>");
outputText("<li> Lord Snakebite (Centipede TF, part of Ghost TF rework)</li>");
outputText("<li> T0uchMe (part of Ghost TF rework)</li>");
outputText("<li> Apex (part of Michiko)</li>");
outputText("<li> Dxasmodeus (Tentacles, Worms, Giacomo)</li>");
Expand Down
44 changes: 22 additions & 22 deletions classes/classes/PlayerAppearance.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3342,30 +3342,30 @@ private function campActionsReflect():void {
outputText("You sit down on your sleeping "+(flags[kFLAGS.CAMP_CABIN_FURNITURE_BED] > 0 ? "bed":"bag")+" and contemplate your current outlook on life. You have been through much and became bigger, better, way more than what you once were.");
if (player.race() != player.startingRace) outputText(" While you were formerly a " + player.startingRace + " you now are a " + player.race() + " for better or for worse and have decided to live this new life to its fullest.");
var oldmaxes:Object = player.getAllMaxStats();
var strStat:Number = player.str/oldmaxes.str;
var touStat:Number = player.tou/oldmaxes.tou;
var speStat:Number = player.spe/oldmaxes.spe;
var inteStat:Number = player.inte/oldmaxes.inte;
var wisStat:Number = player.wis/oldmaxes.wis;
var libStat:Number = player.lib/oldmaxes.lib;
var sensStat:Number = player.sens/oldmaxes.sens;
var strStat1:Number = oldmaxes.str;
var touStat1:Number = oldmaxes.tou;
var speStat1:Number = oldmaxes.spe;
var inteStat1:Number = oldmaxes.inte;
var wisStat1:Number = oldmaxes.wis;
var libStat1:Number = oldmaxes.lib;
var sensStat1:Number = oldmaxes.sens;
var strStat:Number = oldmaxes.str;
var touStat:Number = oldmaxes.tou;
var speStat:Number = oldmaxes.spe;
var inteStat:Number = oldmaxes.inte;
var wisStat:Number = oldmaxes.wis;
var libStat:Number = oldmaxes.lib;
var sensStat:Number = oldmaxes.sens;
player.strtouspeintwislibsenCalculation2();
var newmaxes:Object = player.getAllMaxStats();
if (newmaxes.str != strStat1 || newmaxes.tou != touStat1 || newmaxes.spe != speStat1 || newmaxes.inte != inteStat1 || newmaxes.wis != wisStat1 || newmaxes.lib != libStat1 || newmaxes.sens != sensStat1) outputText(" As if this reflection unlocked some hidden door in you, you feel your body awaken with newfound vigor and might. Let your adversaries come, you are ready for them now!");
if (newmaxes.str != strStat1) player.str = Math.round(player.str * strStat);
if (newmaxes.tou != touStat1) player.tou = Math.round(player.tou * touStat);
if (newmaxes.spe != speStat1) player.spe = Math.round(player.spe * speStat);
if (newmaxes.inte != inteStat1) player.inte = Math.round(player.inte * inteStat);
if (newmaxes.wis != wisStat1) player.wis = Math.round(player.wis * wisStat);
if (newmaxes.lib != libStat1) player.lib = Math.round(player.lib * libStat);
if (newmaxes.sens != sensStat1) player.sens = Math.round(player.sens * sensStat);
var strStat1:Number = newmaxes.str;
var touStat1:Number = newmaxes.tou;
var speStat1:Number = newmaxes.spe;
var inteStat1:Number = newmaxes.inte;
var wisStat1:Number = newmaxes.wis;
var libStat1:Number = newmaxes.lib;
var sensStat1:Number = newmaxes.sens;
if (strStat != strStat1 || touStat != touStat1 || speStat!= speStat1 || inteStat!= inteStat1 || wisStat != wisStat1 || libStat != libStat1 || sensStat != sensStat1) outputText(" As if this reflection unlocked some hidden door in you, you feel your body awaken with newfound vigor and might. Let your adversaries come, you are ready for them now!");
if (strStat != strStat1) player.str = Math.round(player.str * (strStat1/strStat));
if (touStat != touStat1) player.tou = Math.round(player.tou * (touStat1/touStat));
if (speStat!= speStat1) player.spe = Math.round(player.spe * (speStat1/speStat));
if (inteStat!= inteStat1) player.inte = Math.round(player.inte * (inteStat1/inteStat));
if (wisStat != wisStat1) player.wis = Math.round(player.wis * (wisStat1/wisStat));
if (libStat != libStat1) player.lib = Math.round(player.lib * (libStat1/libStat));
if (sensStat != sensStat1) player.sens = Math.round(player.sens * (sensStat1/sensStat));
doNext(playerMenu);
}

Expand Down
25 changes: 13 additions & 12 deletions classes/classes/Scenes/Changelog.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package classes.Scenes
}
private function Changelog32():void {
clearOutput();
outputText("<b>Version 0.8n9:</b>\n\n");
outputText("<b>Version 0.8n9 (Orca, Manticore, Bicorn/Unicorn, Cave Wyrm updates; New TF's: Eastern Bunny, Melkie, Centipede, Kasha, Kraken; Warlocks Dark Ritual, new way to determine showed PC race at app screen and many new sprites showing on character viewer (Lia Twist sponsored whole this title)):</b>\n\n");
outputText("-Orca TF has been revamped.\n");
outputText("-New Orca perk Whale fat.\n");
outputText("-New Orca ability play.\n");
Expand Down Expand Up @@ -63,7 +63,12 @@ package classes.Scenes
outputText("-Fixed Appearance screen declaring you as your lowest score race. You will now always be declared as by your highest valid score.\n");
outputText("-All changes for 0.8n9 was due to hard work of our glorious lady Liadri. With a bit of Lia Twist.\n");
outputText("-Golem scavenging got texts instead of placeholder texts. (Texts ofc also sponsored by Lia Twist and coded by me ;) )\n");
outputText("-Fixed bugs: error in cat tf that would cause text to become bolded, golemancer shop 2 items been unbuyable\n\n");/*ostatni punkt changelogu
outputText("-Fixed bugs: error in cat tf that would cause text to become bolded, golemancer shop 2 items been unbuyable\n\n");
outputText("<b>Version 0.8n10:</b>\n\n");
outputText("-Urta lvl, stats been slight increased. Her stunning mov now just have 66% chance to stun instead smth that felt around 20%.\n");
outputText("-Fixed bugs: Eastern Bunny tf not giving eastern bunny balls\n\n");/*ostatni punkt changelogu
outputText("<b>Version 0.8o:</b>\n\n");
outputText("-Added in current version race effects to Metamorph perk: \n");
//outputText("-New tier 11 strength lvl-up perk: Too Angry to Die. Req. Fuel for the Fire perk. Effect: . (+600 max Wrath)\n");//tier 0,1,4
//outputText("-New tier 0 misc lvl-up perk: Metamorph (Ex). Req. Metamorph perk. Effect: Opening more options to change PC body. Some would be accesable right away and other will require to unlock them using genetic memory.\n");
//outputText("-Increased max lvl camp npc's can attain after reaching end of training: Electra (lvl 36)\n");
Expand All @@ -74,10 +79,16 @@ package classes.Scenes
//outputText("-New tier 5 strength lvl-up perk: Titan Grip (Su). Req. Titan Grip (Ex) perk and 120+ str. Effect: Allow to wield massive weapons in one hand.\n");może inny effeckt a dual wieldable massive weapons pod innym perkiem - jakiś lepszy niż Titan Grip? xD
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");//New range weapon (by Liadri): - buyable at Tripxi shop in Tel'Adre after PC find and bring back it parts from area. Cost xx0 gems. Base atk is xx and ammo clip size x.
outputText("-\n");//add bang ball items flavored for fire/ice/lighting/darkness/poison
outputText("-\n");//, ?Vala?, ?Tamani+her brood?, ?minotaur sons? - for out of camp lvl-ing npc's
outputText("-\n");//Motivation (Ex) now req. additionaly Intermediate Leadership perk//Motivation (Su) now req. additionaly Advanced Leadership perk
outputText("-Fixed bugs: \n\n");
//outputText("-New encounter in Glacial Rift: Melkie Huntress.\n");
//outputText("-New necklace (by Ormael): Necklace of - buyable at Kaiba shop in Tel'Adre. Cost 00 gems. .\n");
//outputText("-New head jewelery/accesory/misc (by Ormael): of - buyable at Kaiba shop in Tel'Adre. Cost 00 gems. .\n");
Expand Down Expand Up @@ -128,14 +139,6 @@ package classes.Scenes
outputText("-New tier 30 misc lvl-up perk: . Req. perk. Effect: +10% minions/pets damage.\n");
outputText("-New tier ?? misc lvl-up perk: . Req. perk. Effect: +10% minions/pets damage.\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-Added in current version race effects to Metamorph perk: \n");Goo, Siren, Avian-morph, Cave Wyrm, Hinezumi, Bear/Panda(what about Centaur race? need rework still or nah? or just adding to Metamorph menu but how i mean with what bodyparts?)
outputText("\n");
outputText("\n");
Expand Down Expand Up @@ -167,8 +170,6 @@ package classes.Scenes
outputText("\n");wolf pepper - nieużywany item chyba co można go by w wolf TF zmienić: dodaje special coś na kształt likantropii ^^
outputText("\n");aqua seed - item mający być siren tf item
outputText("\n");
outputText("<b>Version 0.8o:</b>\n\n");
outputText("-Added in current version race effects to Metamorph perk: \n");
outputText("<b>Version 0.8p:</b>\n\n");
outputText("-Added in current version race effects to Metamorph perk: \n");
outputText("\n");
Expand Down
26 changes: 20 additions & 6 deletions classes/classes/Scenes/Quests/UrtaQuest.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ public function startUrtaQuest():void {
player.vaginas[0].vaginalWetness = VaginaClass.WETNESS_DROOLING;
player.vaginas[0].vaginalLooseness = VaginaClass.LOOSENESS_NORMAL;
player.clitLength = 1;
player.str = 100;
player.tou = 110;
player.spe = 120;
player.str = 143;
player.tou = 183;
player.spe = 178;
player.inte = 60;
player.wis = 50;
player.lib = 90;
Expand All @@ -304,7 +304,7 @@ public function startUrtaQuest():void {
player.soulforce = 50;
player.wrath = 0;
player.gems = 183;
player.level = 26;
player.level = 30;
player.teaseLevel = 15;
player.str += (flags[kFLAGS.NEW_GAME_PLUS_LEVEL] * 34);
player.tou += (flags[kFLAGS.NEW_GAME_PLUS_LEVEL] * 37);
Expand Down Expand Up @@ -336,7 +336,9 @@ public function startUrtaQuest():void {
player.createPerk(PerkLib.JobAllRounder,0,0,0,0);
player.createPerk(PerkLib.HiddenMomentum,0,0,0,0);
player.createPerk(PerkLib.HoldWithBothHands,0,0,0,0);
player.createPerk(PerkLib.ColdFury,0,0,0,0);
player.createPerk(PerkLib.ColdFury, 0, 0, 0, 0);
player.createPerk(PerkLib.UnlockBody, 0, 0, 0, 0);
player.createPerk(PerkLib.UnlockBody2ndStage, 0, 0, 0, 0);
player.createPerk(PerkLib.BasicSelfControl, 0, 0, 0, 0);
if (player.newGamePlusMod() >= 1) player.createPerk(PerkLib.HalfStepToImprovedSelfControl, 0, 0, 0, 0);
if (player.newGamePlusMod() >= 2) player.createPerk(PerkLib.ImprovedSelfControl, 0, 0, 0, 0);
Expand Down Expand Up @@ -373,6 +375,18 @@ public function startUrtaQuest():void {
if (player.newGamePlusMod() >= 3) player.createPerk(PerkLib.TankIV,0,0,0,0);
if (player.newGamePlusMod() >= 4) player.createPerk(PerkLib.TankV,0,0,0,0);
if (player.newGamePlusMod() >= 5) player.createPerk(PerkLib.TankVI,0,0,0,0);
player.createPerk(PerkLib.GoliathI,0,0,0,0);
if (player.newGamePlusMod() >= 1) player.createPerk(PerkLib.GoliathII,0,0,0,0);
if (player.newGamePlusMod() >= 2) player.createPerk(PerkLib.GoliathIII,0,0,0,0);
if (player.newGamePlusMod() >= 3) player.createPerk(PerkLib.GoliathIV,0,0,0,0);
if (player.newGamePlusMod() >= 4) player.createPerk(PerkLib.GoliathV,0,0,0,0);
if (player.newGamePlusMod() >= 5) player.createPerk(PerkLib.GoliathVI,0,0,0,0);
player.createPerk(PerkLib.CheetahI,0,0,0,0);
if (player.newGamePlusMod() >= 1) player.createPerk(PerkLib.CheetahII,0,0,0,0);
if (player.newGamePlusMod() >= 2) player.createPerk(PerkLib.CheetahIII,0,0,0,0);
if (player.newGamePlusMod() >= 3) player.createPerk(PerkLib.CheetahIV,0,0,0,0);
if (player.newGamePlusMod() >= 4) player.createPerk(PerkLib.CheetahV,0,0,0,0);
if (player.newGamePlusMod() >= 5) player.createPerk(PerkLib.CheetahVI,0,0,0,0);
player.createPerk(PerkLib.DancersVitalityI,0,0,0,0);
if (player.newGamePlusMod() >= 1) player.createPerk(PerkLib.DancersVitalityII,0,0,0,0);
if (player.newGamePlusMod() >= 2) player.createPerk(PerkLib.DancersVitalityIII,0,0,0,0);
Expand Down Expand Up @@ -1360,7 +1374,7 @@ private function urtaSidewinder():void {
else monster.armorDef = 0;
}
if(!monster.hasStatusEffect(StatusEffects.Stunned) && monster.findPerk(PerkLib.Resolute) < 0 && damage > 0) {
if(monster.tou/10 + rand(20) + 1 < 20) {
if(rand(3) > 0) {
outputText("\n<b>" + monster.capitalA + monster.short + " is stunned!</b>");
monster.createStatusEffect(StatusEffects.Stunned,1,0,0,0);
}
Expand Down

0 comments on commit 797cc9e

Please sign in to comment.