Skip to content

Commit

Permalink
0.8n4a
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ormael7
Ormael7 committed Nov 4, 2019
1 parent 3669872 commit d920bd0
Show file tree
Hide file tree
Showing 25 changed files with 559 additions and 363 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.8n4.swf" />
<movie path="..\..\Desktop\CoC_Xianxia_0.8n4a.swf" />
<movie fps="24" />
<movie width="1000" />
<movie height="800" />
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/CharCreation.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3201,8 +3201,8 @@ import coc.view.MainView;
mainView.hideComboBox();
outputText("Everything fades to white and finally... black. You can feel yourself being whisked back to reality as you slowly awaken in your room. You survey your surroundings and recognize almost immediately; you are in your room inside the inn in Ingnam! You get up and look around. ");
if (player.hasKeyItem("Sky Poison Pearl") >= 0) {
outputText("\n\nYou soon notice a circular green imprint at the palm of your left hand. When you try to figure out its meaning something clicks in your mind. It's a strange artifact that fused with your body that allows the storing of a multitude of objects. ...An artifact that fused with your body? You are unable to recall when th... Wait a second there are a few almost fully faded memory fragments of you being somewhere underwater, fearlessly facing some huge monster with tentacles for legs... Doing your uttermost effort to survive and win.. no other memories.. not even the slightest of fragments appear in your mind.");
outputText(" Resigned, you try to concentrate on remembering how to use this thing, but those memories are still too blurred out to make sense of. Maybe with time you'll remember all about this... 'thing'.")
outputText("\n\nYou soon notice a circular green imprint at the palm of your left hand. When you try to figure out its meaning something clicks in your mind. It's a strange artifact that fused with your body that allows the storing of a multitude of objects. ...An artifact that fused with your body? You are unable to recall when th... Wait a second there are a few almost fully faded memory fragments of you being somewhere underwater, ");
outputText("fearlessly facing some huge monster with tentacles for legs... Doing your uttermost effort to survive and win.. no other memories.. not even the slightest of fragments appear in your mind. Resigned, you try to concentrate on remembering how to use this thing, but those memories are still too blurred out to make sense of. Maybe with time you'll remember all about this... 'thing'.")
}
player.breastRows = [];
player.cocks = [];
Expand Down
6 changes: 3 additions & 3 deletions classes/classes/CoC.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class CoC extends MovieClip
public var date:Date = new Date();

//Mod save version.
public var modSaveVersion:Number = 25;
public var modSaveVersion:Number = 26;
public var levelCap:Number = 150;

//Used to restrict random drops from overlapping uniques
Expand Down 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.8n4";
version = ver + " (<b>Ebon Labyrinth, ghost TF rework, goo tf rework (p.1), Hydra and Fire Snail TF's, character viewer update (p.4), other smaller changes</b>)";
ver = "1.0.2_mod_Xianxia_0.8n4a";//5
version = ver + " (<b>Bugfixes</b>)";

this.images = new ImageManager(stage, mainView);
this.inputManager = new InputManager(stage, mainView, false);
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/GlobalFlags/kFLAGS.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1998,8 +1998,8 @@ public static const UNKNOWN_FLAG_NUMBER_01989:int
public static const UNKNOWN_FLAG_NUMBER_01990:int = 1990;
public static const UNKNOWN_FLAG_NUMBER_01991:int = 1991;
public static const UNKNOWN_FLAG_NUMBER_01992:int = 1992;
public static const UNKNOWN_FLAG_NUMBER_01993:int = 1993;
public static const UNKNOWN_FLAG_NUMBER_01994:int = 1994;
public static const PLAYER_DISARMED_UNDERWEAR_UPPER_ID:int = 1993;
public static const PLAYER_DISARMED_UNDERWEAR_BOTTOM_ID:int = 1994;
public static const PLAYER_DISARMED_ARMOR_ID:int = 1995;
public static const PLAYER_DISARMED_SHIELD_ID:int = 1996;
public static const PLAYER_DISARMED_WEAPON_R_ID:int = 1997;
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 @@ -13792,7 +13792,7 @@ public final class Mutations extends MutationsHelper
if (rand (2) == 0) player.hairColor = "orange";
else player.hairColor = "pinkish orange";
}
outputText("\n\nAs if sweating wasn't bad enough your body temperature suddenly spikes again. Before you know it your entire body is set on fire, especially your hair of which the tips glows like smoldering embers. Not only that but Instead of normal sweat your entire body now quite literally seethes liquid fire. <b>Guess you are now a full fire snail with those burning hair of yours.</b>");
outputText("\n\nAs if sweating wasn't bad enough your body temperature suddenly spikes again. Before you know it your entire body is set on fire, especially your hair of which the tips glows like smoldering embers. Not only that but Instead of normal sweat your entire body now quite literally seethes liquid fire. <b>Guess you’re a full fire snail now with this burning hair of yours.</b>");
setHairType(Hair.BURNING);
changes++;
}
Expand Down Expand Up @@ -14260,4 +14260,4 @@ public final class Mutations extends MutationsHelper
}
}
}


106 changes: 51 additions & 55 deletions classes/classes/Player.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4824,16 +4824,18 @@ use namespace CoC;
{
Begin("Player","racialScore","goo");
var gooCounter:Number = 0;
if (hairType == Hair.GOO)
gooCounter++;
if (arms.type == Arms.GOO)
gooCounter++;
if (lowerBody == LowerBody.GOO)
gooCounter += 3;
if (rearBody.type == RearBody.METAMORPHIC_GOO)
gooCounter += 2;
if (hasGooSkin() && skinAdj == "slimy") {
if (skinTone != "red" || skinTone != "orange" || skinTone != "reddish orange" || skinTone != "indigo" || skinTone != "light purple" || skinTone != "purple" || skinTone != "purplish black") {
gooCounter++;
if (hairType == Hair.GOO)
gooCounter++;
if (arms.type == Arms.GOO)
gooCounter++;
if (lowerBody == LowerBody.GOO)
gooCounter += 3;
if (rearBody.type == RearBody.METAMORPHIC_GOO)
gooCounter += 2;
if (hasGooSkin() && skinAdj == "slimy")
gooCounter++;
if (faceType == Face.HUMAN)
gooCounter++;
if (eyes.type == Eyes.HUMAN)
Expand All @@ -4844,28 +4846,25 @@ use namespace CoC;
gooCounter++;
if (hasVagina())
gooCounter++;
if (antennae.type == Antennae.NONE)
gooCounter++;
if (wings.type == Wings.NONE)
gooCounter++;
if (gills.type == Gills.NONE)
gooCounter++;
}
if (antennae.type == Antennae.NONE)
gooCounter++;
if (wings.type == Wings.NONE)
gooCounter++;
if (gills.type == Gills.NONE)
gooCounter++;
if (vaginalCapacity() > 9000)
gooCounter++;
if (hasStatusEffect(StatusEffects.SlimeCraving))
gooCounter++;
//if (findPerk(PerkLib.SlimeCore) >= 0)
// gooCounter++;
if (skinTone == "red" || skinTone == "orange" || skinTone == "reddish orange" || skinTone == "indigo" || skinTone == "light purple" || skinTone == "purple" || skinTone == "purplish black")
gooCounter -= 16;
if (findPerk(PerkLib.ChimericalBodyUltimateStage) >= 0)
gooCounter += 50;
if (findPerk(PerkLib.AscensionHybridTheory) >= 0 && gooCounter >= 4)
gooCounter += 1;
if (findPerk(PerkLib.AscensionCruelChimerasThesis) >= 0 && gooCounter >= 8)
gooCounter += 1;
if (gooCounter < 0) gooCounter = 0;
if (isGargoyle()) gooCounter = 0;
End("Player","racialScore");
return gooCounter;
Expand All @@ -4875,18 +4874,18 @@ use namespace CoC;
{
Begin("Player","racialScore","magmagoo");
var magmagooCounter:Number = 0;
if (hairType == Hair.GOO)
magmagooCounter++;
if (arms.type == Arms.GOO)
magmagooCounter++;
if (lowerBody == LowerBody.GOO)
magmagooCounter += 3;
if (rearBody.type == RearBody.METAMORPHIC_GOO)
if (skinTone == "red" || skinTone == "orange" || skinTone == "reddish orange") {
magmagooCounter += 2;
if (hasGooSkin() && skinAdj == "slimy") {
magmagooCounter++;
if (skinTone == "red" || skinTone == "orange" || skinTone == "reddish orange")
if (hairType == Hair.GOO)
magmagooCounter++;
if (arms.type == Arms.GOO)
magmagooCounter++;
if (lowerBody == LowerBody.GOO)
magmagooCounter += 3;
if (rearBody.type == RearBody.METAMORPHIC_GOO)
magmagooCounter += 2;
if (hasGooSkin() && skinAdj == "slimy")
magmagooCounter++;
if (faceType == Face.HUMAN)
magmagooCounter++;
if (eyes.type == Eyes.HUMAN)
Expand All @@ -4897,13 +4896,13 @@ use namespace CoC;
magmagooCounter++;
if (hasVagina())
magmagooCounter++;
if (antennae.type == Antennae.NONE)
magmagooCounter++;
if (wings.type == Wings.NONE)
magmagooCounter++;
if (gills.type == Gills.NONE)
magmagooCounter++;
}
if (antennae.type == Antennae.NONE)
magmagooCounter++;
if (wings.type == Wings.NONE)
magmagooCounter++;
if (gills.type == Gills.NONE)
magmagooCounter++;
if (vaginalCapacity() > 9000)
magmagooCounter++;
if (hasStatusEffect(StatusEffects.SlimeCraving))
Expand All @@ -4925,17 +4924,17 @@ use namespace CoC;
{
Begin("Player","racialScore","darkgoo");
var darkgooCounter:Number = 0;
if (hairType == Hair.GOO)
darkgooCounter++;
if (arms.type == Arms.GOO)
if (skinTone == "indigo" || skinTone == "light purple" || skinTone == "purple" || skinTone == "purplish black") {
darkgooCounter++;
if (lowerBody == LowerBody.GOO)
darkgooCounter += 3;
if (rearBody.type == RearBody.METAMORPHIC_GOO)
darkgooCounter += 2;
if (hasGooSkin() && skinAdj == "slimy") {
darkgooCounter++;
if (skinTone == "indigo" || skinTone == "light purple" || skinTone == "purple" || skinTone == "purplish black")
if (hairType == Hair.GOO)
darkgooCounter++;
if (arms.type == Arms.GOO)
darkgooCounter++;
if (lowerBody == LowerBody.GOO)
darkgooCounter += 3;
if (rearBody.type == RearBody.METAMORPHIC_GOO)
darkgooCounter += 2;
if (hasGooSkin() && skinAdj == "slimy")
darkgooCounter++;
if (faceType == Face.HUMAN)
darkgooCounter++;
Expand All @@ -4947,28 +4946,25 @@ use namespace CoC;
darkgooCounter++;
if (hasVagina())
darkgooCounter++;
if (antennae.type == Antennae.NONE)
darkgooCounter++;
if (wings.type == Wings.NONE)
darkgooCounter++;
if (gills.type == Gills.NONE)
darkgooCounter++;
}
if (antennae.type == Antennae.NONE)
darkgooCounter++;
if (wings.type == Wings.NONE)
darkgooCounter++;
if (gills.type == Gills.NONE)
darkgooCounter++;
if (vaginalCapacity() > 9000)
darkgooCounter++;
if (hasStatusEffect(StatusEffects.SlimeCraving))
darkgooCounter++;
//if (findPerk(PerkLib.SlimeCore) >= 0)
// darkgooCounter++;
if (skinTone == "red" || skinTone == "orange" || skinTone == "reddish orange")
darkgooCounter -= 16;
if (findPerk(PerkLib.ChimericalBodyUltimateStage) >= 0)
darkgooCounter += 50;
if (findPerk(PerkLib.AscensionHybridTheory) >= 0 && darkgooCounter >= 4)
darkgooCounter += 1;
if (findPerk(PerkLib.AscensionCruelChimerasThesis) >= 0 && darkgooCounter >= 8)
darkgooCounter += 1;
if (darkgooCounter < 0) darkgooCounter = 0;
if (isGargoyle()) darkgooCounter = 0;
End("Player","racialScore");
return darkgooCounter;
Expand Down Expand Up @@ -7294,7 +7290,7 @@ use namespace CoC;
* @param nl
*/
public function refillHunger(amnt:Number = 0, nl:Boolean = true):void {
if ((flags[kFLAGS.HUNGER_ENABLED] > 0 || flags[kFLAGS.IN_PRISON] > 0) && !isGargoyle())
if ((flags[kFLAGS.HUNGER_ENABLED] > 0 || flags[kFLAGS.CURSE_OF_THE_JIANGSHI] != 2 || flags[kFLAGS.CURSE_OF_THE_JIANGSHI] != 3 || flags[kFLAGS.IN_PRISON] > 0) && (!hasPerk(PerkLib.GargoylePure) || !hasPerk(PerkLib.GargoyleCorrupted)))
{

var oldHunger:Number = hunger;
Expand Down Expand Up @@ -7426,7 +7422,7 @@ use namespace CoC;
if(flags[kFLAGS.MINOTAUR_CUM_ADDICTION_TRACKER] >= 60) raw /= 2;
if(flags[kFLAGS.MINOTAUR_CUM_ADDICTION_TRACKER] >= 80) raw /= 2;
if(flags[kFLAGS.MINOTAUR_CUM_ADDICTION_TRACKER] >= 90) raw /= 2;
if(findPerk(PerkLib.MinotaurCumResistance) >= 0 || findPerk(PerkLib.ManticoreCumAddict) >= 0) raw *= 0;
if(findPerk(PerkLib.MinotaurCumResistance) >= 0 || findPerk(PerkLib.ManticoreCumAddict) >= 0 || findPerk(PerkLib.HaltedVitals) >= 0) raw *= 0;
//If in withdrawl, readdiction is potent!
if(flags[kFLAGS.MINOTAUR_CUM_ADDICTION_STATE] == 3) raw += 10;
if(flags[kFLAGS.MINOTAUR_CUM_ADDICTION_STATE] == 2) raw += 5;
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/PlayerEvents.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@ if (CoC.instance.model.time.hours > 23) { //Once per day

private function hourlyHunger():Boolean {
var needNext:Boolean = false;
if (flags[kFLAGS.HUNGER_ENABLED] > 0 || prison.inPrison) {
if (flags[kFLAGS.HUNGER_ENABLED] > 0 || flags[kFLAGS.CURSE_OF_THE_JIANGSHI] != 2 || flags[kFLAGS.CURSE_OF_THE_JIANGSHI] != 3 || prison.inPrison) {
var multiplier:Number = 1.0;
if (player.findPerk(PerkLib.Survivalist) >= 0) multiplier -= 0.2;
if (player.findPerk(PerkLib.Survivalist2) >= 0) multiplier -= 0.2;
Expand Down Expand Up @@ -1956,7 +1956,7 @@ if (CoC.instance.model.time.hours > 23) { //Once per day
return true;
}
//Pussytail Bad End
if (player.tailType == Tail.MANTICORE_PUSSYTAIL && player.hasCock()) {
if (player.tailType == Tail.MANTICORE_PUSSYTAIL && player.hasCock() && !debug) {
SceneLib.camp.campUniqueScenes.badendManticoreOuroboros();
return true;
}
Expand Down
18 changes: 17 additions & 1 deletion classes/classes/PlayerInfo.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,26 @@ public class PlayerInfo extends BaseContent {
miscStats += "<b>Metal Pieces:</b> " + flags[kFLAGS.CAMP_CABIN_METAL_PIECES_RESOURCES] + "/200" + "\n";
}

miscStats += "<b>Basic Jobs:</b> " + player.currentBasicJobs() + " / 10" + "\n";
miscStats += "<b>Basic Jobs:</b> " + player.currentBasicJobs() + " / 10\n";
miscStats += "<b>Advanced Jobs:</b> " + player.currentAdvancedJobs() + " / " + player.maxAdvancedJobs() + "\n";
//miscStats += "<b>Hidden Jobs:</b> " + player.currentHiddenJobs() + " / " + player.maxHiddenJobs() + "\n";
miscStats += "<b>Prestige Jobs:</b> " + player.currentPrestigeJobs() + " / " + player.maxPrestigeJobs() + "\n";

if (player.hasStatusEffect(StatusEffects.AdventureGuildQuestsCounter1)) {
miscStats += "<b>Imps Hunt Quests completed:</b> " + player.statusEffectv1(StatusEffects.AdventureGuildQuestsCounter1) + "\n";
miscStats += "<b>Demons Hunt Quests completed:</b> " + player.statusEffectv2(StatusEffects.AdventureGuildQuestsCounter1) + "\n";
miscStats += "<b>Minotaurs Hunt Quests completed:</b> " + player.statusEffectv3(StatusEffects.AdventureGuildQuestsCounter1) + "\n";
}
if (player.hasStatusEffect(StatusEffects.AdventureGuildQuestsCounter2)) {
miscStats += "<b>Feral Tentacle Beasts Hunt Quests completed:</b> " + player.statusEffectv1(StatusEffects.AdventureGuildQuestsCounter2) + "\n";
miscStats += "<b>Feral Imps Hunt Quests completed:</b> " + player.statusEffectv2(StatusEffects.AdventureGuildQuestsCounter2) + "\n";
//miscStats += "<b>Imps Hunt Quests completed:</b> " + player.statusEffectv3(StatusEffects.AdventureGuildQuestsCounter2) + "\n";
}
if (player.hasStatusEffect(StatusEffects.AdventureGuildQuestsCounter4)) {
miscStats += "<b>Black Chitin Gathering Quests completed:</b> " + player.statusEffectv1(StatusEffects.AdventureGuildQuestsCounter4) + "\n";
miscStats += "<b>Green Gel Gathering Quests completed:</b> " + player.statusEffectv2(StatusEffects.AdventureGuildQuestsCounter4) + "\n";
//miscStats += "<b>Imps Hunt Quests completed:</b> " + player.statusEffectv3(StatusEffects.AdventureGuildQuestsCounter1) + "\n";
}

if (flags[kFLAGS.CORRUPTED_GLADES_DESTROYED] > 0) {
if (flags[kFLAGS.CORRUPTED_GLADES_DESTROYED] < 100)
Expand Down
4 changes: 4 additions & 0 deletions classes/classes/Scenes/Achievements.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,10 @@ public class Achievements extends BaseContent
addAchievement("Us Evolve", kACHIEVEMENTS.EPIC_US_EVOLVE, "Find two evolving items.", "", true);
//znalezienie 4 ewolujących przedmiotów
//znalezienie 8 ewolujących przedmiotów
//przeprowadznie 1 ewolucji przedmiotu
//przeprowadznie 2 ewolucji przedmiotu
//przeprowadznie 4 ewolucji przedmiotu
//przeprowadznie 8 ewolucji przedmiotu
addAchievement("Achievementception", kACHIEVEMENTS.EPIC_ACHIEVEMENTCEPTION, "Unlocking 10 achievements.", "", true);
addAchievement("Achievement within Achievement", kACHIEVEMENTS.EPIC_ACHIEVEMENT_WITHIN_ACHIEVEMENT, "Unlocking 30 achievements.", "", true);
addAchievement("Achievements - Going Deeper (1st layer)", kACHIEVEMENTS.EPIC_ACHIEVEMENTS_GOING_DEEPER_1L, "Unlocking 60 achievements.", "", true);
Expand Down
4 changes: 4 additions & 0 deletions classes/classes/Scenes/Areas/BlightRidge.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ use namespace CoC;
return;
}
//Siegweird
if (player.statusEffectv1(StatusEffects.AlvinaTraining2) == 3 && flags[kFLAGS.SIEGWEIRD_FOLLOWER] < 3 && rand(4) == 0) {
SceneLib.siegweirdFollower.siegweirdFirstEncounter();
return;
}
if (flags[kFLAGS.SIEGWEIRD_FOLLOWER] < 2 && rand(4) == 0) {
SceneLib.siegweirdFollower.siegweirdFirstEncounter();
return;
Expand Down
Loading

0 comments on commit d920bd0

Please sign in to comment.