Skip to content

Commit

Permalink
Merge pull request #325 from Ormael7/master-wip
Browse files Browse the repository at this point in the history 
Master wip
  • Loading branch information
@Ormael7
Ormael7 authored Apr 1, 2021
2 parents 777ac0e + a0f23a0 commit 0619a1a
Show file tree
Hide file tree
Showing 126 changed files with 6,835 additions and 2,905 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.8p.swf" />
<movie path="..\..\Desktop\CoC_Xianxia_0.8r.swf" />
<movie fps="24" />
<movie width="1000" />
<movie height="800" />
Expand Down
3 changes: 2 additions & 1 deletion classes/classes/Appearance.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2548,7 +2548,8 @@ public class Appearance extends Utils
[VaginaClass.CANCER, "foaming"],
[VaginaClass.DEMONIC, "fiendish"],
[VaginaClass.ALRAUNE, "floral"],
[VaginaClass.SCYLLA, "maw-like"]
[VaginaClass.SCYLLA, "maw-like"],
[VaginaClass.NAGA, "deep"]
]
);

Expand Down
19 changes: 18 additions & 1 deletion classes/classes/CharCreation.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ import coc.view.MainView;
var newFlags:DefaultDict = new DefaultDict();
if (player.hasKeyItem("Ascension") >= 0) {
for each(var flag:int in [kFLAGS.NEW_GAME_PLUS_LEVEL, kFLAGS.HUNGER_ENABLED, kFLAGS.HARDCORE_MODE, kFLAGS.HARDCORE_SLOT, kFLAGS.GAME_DIFFICULTY, kFLAGS.EASY_MODE_ENABLE_FLAG, kFLAGS.NO_GORE_MODE, kFLAGS.WISDOM_SCALLING, kFLAGS.INTELLIGENCE_SCALLING, kFLAGS.STRENGTH_SCALLING, kFLAGS.SPEED_SCALLING, kFLAGS.SECONDARY_STATS_SCALING, kFLAGS.SPELLS_COOLDOWNS,
kFLAGS.WATERSPORTS_ENABLED, kFLAGS.SILLY_MODE_ENABLE_FLAG, kFLAGS.LOW_STANDARDS_FOR_ALL, kFLAGS.HYPER_HAPPY, kFLAGS.SFW_MODE, kFLAGS.NEW_GAME_PLUS_BONUS_UNLOCKED_HERM, kFLAGS.MELEE_DAMAGE_OVERHAUL]) {
kFLAGS.WATERSPORTS_ENABLED, kFLAGS.SILLY_MODE_ENABLE_FLAG, kFLAGS.LOW_STANDARDS_FOR_ALL, kFLAGS.HYPER_HAPPY, kFLAGS.SFW_MODE, kFLAGS.NEW_GAME_PLUS_BONUS_UNLOCKED_HERM, kFLAGS.MELEE_DAMAGE_OVERHAUL, kFLAGS.LVL_UP_FAST, kFLAGS.MUTATIONS_SPOILERS, kFLAGS.INVT_MGMT_TYPE, kFLAGS.CHARVIEW_STYLE]) {
newFlags[flag] = flags[flag];
}
}
Expand Down Expand Up @@ -3650,6 +3650,10 @@ import coc.view.MainView;
player.tailType = Tail.NONE;
player.tailRecharge = 0;
player.level = 0;
player.masteryGauntletLevel = 0;
player.masteryGauntletXP = 0;
player.masteryDaggerLevel = 0;
player.masteryDaggerXP = 0;
player.masterySwordLevel = 0;
player.masterySwordXP = 0;
player.masteryAxeLevel = 0;
Expand All @@ -3660,6 +3664,16 @@ import coc.view.MainView;
player.masteryDuelingSwordXP = 0;
player.masterySpearLevel = 0;
player.masterySpearXP = 0;
player.masteryWhipLevel = 0;
player.masteryWhipXP = 0;
player.masteryExoticLevel = 0;
player.masteryExoticXP = 0;
player.masteryArcheryLevel = 0;
player.masteryArcheryXP = 0;
player.masteryThrowingLevel = 0;
player.masteryThrowingXP = 0;
player.masteryFirearmsLevel = 0;
player.masteryFirearmsXP = 0;
player.dualWSLevel = 0;
player.dualWSXP = 0;
player.dualWNLevel = 0;
Expand All @@ -3683,6 +3697,9 @@ import coc.view.MainView;
player.setHeadJewelry(HeadJewelryLib.NOTHING);
player.setNecklace(NecklaceLib.NOTHING);
player.setJewelry(JewelryLib.NOTHING);
player.setJewelry2(JewelryLib.NOTHING);
player.setJewelry3(JewelryLib.NOTHING);
player.setJewelry4(JewelryLib.NOTHING);
player.setVehicle(VehiclesLib.NOTHING);
inventory.clearStorage();
inventory.clearGearStorage();
Expand Down
315 changes: 181 additions & 134 deletions classes/classes/Character.as
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions classes/classes/CoC.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,8 @@ public class CoC extends MovieClip
//model.debug = debug; // TODO: Set on model?

//Version NUMBER
ver = "1.0.2_mod_Xianxia_0.8p";
version = ver + " (<b>Cyclop/Gazer TF, Aether Twins first evo, New Bosses in Ebon Labyrinth, Mastery for melee weapons (part 1), many small changes and bugfixes</b>)";
ver = "1.0.2_mod_Xianxia_0.8r";
version = ver + " (<b>2nd marriage option, new type of enemeis + 2nd floor of RD opened, wrath changes (part 1), 2nd hidden job, many small QoL changes and bugfixes</b>)";

this.images = new ImageManager(stage, mainView);
this.inputManager = new InputManager(stage, mainView, false);
Expand Down
340 changes: 172 additions & 168 deletions classes/classes/Creature.as
View file

Large diffs are not rendered by default.

34 changes: 18 additions & 16 deletions classes/classes/EngineCore.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ public class EngineCore {
return CoC.instance.player.maxWrath();
}

public static function maxOverWrath():Number {
return CoC.instance.player.maxOverWrath();
}

public static function maxMana():Number {
return CoC.instance.player.maxMana();
}
Expand Down Expand Up @@ -204,13 +208,13 @@ public class EngineCore {
var before:Number = CoC.instance.player.wrath;
if (changeNum == 0) return 0;
if (changeNum > 0) {
if (CoC.instance.player.wrath + int(changeNum) > maxWrath()) {
if (CoC.instance.player.wrath + int(changeNum) > maxOverWrath()) {
// if(CoC.instance.player.HP >= maxHP()) {
// if (display) HPChangeNotify(changeNum);
// return CoC.instance.player.HP - before;
// }
// if (display) HPChangeNotify(changeNum);
CoC.instance.player.wrath = maxWrath();
CoC.instance.player.wrath = maxOverWrath();
}
else {
// if (display) HPChangeNotify(changeNum);
Expand All @@ -220,21 +224,19 @@ public class EngineCore {
}
}
//Negative Wrath
/* else
{
if(CoC.instance.player.HP + changeNum <= 0) {
if (display) HPChangeNotify(changeNum);
CoC.instance.player.HP = 0;
CoC.instance.mainView.statsView.showStatDown( 'hp' );
}
else {
if (display) HPChangeNotify(changeNum);
CoC.instance.player.HP += changeNum;
CoC.instance.mainView.statsView.showStatDown( 'hp' );
}
else {
if (CoC.instance.player.wrath + changeNum <= 0) {
//if (display) HPChangeNotify(changeNum);
CoC.instance.player.wrath = 0;
//CoC.instance.mainView.statsView.showStatDown('hp');
}
dynStats("lust", 0, "scale", false) //Workaround to showing the arrow.
*/
else {
//if (display) HPChangeNotify(changeNum);
CoC.instance.player.wrath += changeNum;
// CoC.instance.mainView.statsView.showStatDown('hp');
}
}
CoC.instance.player.dynStats("lust", 0, "scale", false); //Workaround to showing the arrow.
statScreenRefresh();
return CoC.instance.player.wrath - before;
}
Expand Down
22 changes: 15 additions & 7 deletions classes/classes/EventParser.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import classes.Items.ArmorLib;
import classes.Items.ShieldLib;
import classes.Items.UndergarmentLib;
import classes.Items.WeaponLib;
import classes.Items.WeaponRangeLib;
import classes.Scenes.Dungeons.DungeonAbstractContent;
import classes.Scenes.NPCs.ZenjiScenes;
import classes.Scenes.SceneLib;
Expand Down Expand Up @@ -88,6 +89,7 @@ public class EventParser {

if (CoC.instance.player.hasStatusEffect(StatusEffects.EbonLabyrinthB)) {
if (CoC.instance.player.hasStatusEffect(StatusEffects.ThereCouldBeOnlyOne)) CoC.instance.player.removeStatusEffect(StatusEffects.ThereCouldBeOnlyOne);
if (CoC.instance.flags[kFLAGS.EBON_LABYRINTH_RECORD] < CoC.instance.player.statusEffectv1(StatusEffects.EbonLabyrinthB)) CoC.instance.flags[kFLAGS.EBON_LABYRINTH_RECORD] = CoC.instance.player.statusEffectv1(StatusEffects.EbonLabyrinthB);
CoC.instance.player.removeStatusEffect(StatusEffects.EbonLabyrinthA);
CoC.instance.player.removeStatusEffect(StatusEffects.EbonLabyrinthB);
if (CoC.instance.player.hasStatusEffect(StatusEffects.EbonLabyrinthBoss1)) CoC.instance.player.removeStatusEffect(StatusEffects.EbonLabyrinthBoss1);
Expand Down Expand Up @@ -290,16 +292,22 @@ public class EventParser {
// inventory.takeItem(player.setWeapon(WeaponLib.FISTS), playerMenu);
// return true;
// }
//Drop beautiful sword if corrupted!
if (player.weaponPerk == "holySword" && player.cor >= (33 + player.corruptionTolerance())) {
EngineCore.outputText("<b>\nThe <u>[weapon]</u> grows hot in your hand, until you are forced to drop it. Whatever power inhabits this blade appears to be unhappy with you. Touching it gingerly, you realize it is no longer hot, but as soon as you go to grab the hilt, it nearly burns you.\n\nYou realize you won't be able to use it right now, but you could probably keep it in your inventory.</b>\n\n");
//Drop Excalibur / beautiful sword / beautiful staff if corrupted!
if ((player.weapon == CoC.instance.weapons.EXCALIB || player.weapon == CoC.instance.weapons.B_SWORD || player.weapon == CoC.instance.weapons.B_STAFF) && player.cor >= (33 + player.corruptionTolerance())) {
EngineCore.outputText("<b>\nThe <u>[weapon]</u> grows hot in your hand, until you are forced to drop it. Whatever power inhabits this weapon appears to be unhappy with you. Touching it gingerly, you realize it is no longer hot, but as soon as you go to grab the hilt, it nearly burns you.\n\nYou realize you won't be able to use it right now, but you could probably keep it in your inventory.</b>\n\n");
SceneLib.inventory.takeItem(player.setWeapon(WeaponLib.FISTS), playerMenu);
return true;
}
//Drop Excalibur if corrupted!
if (player.weaponPerk == "Excalibur" && player.cor >= (33 + player.corruptionTolerance())) {
EngineCore.outputText("<b>\nThe <u>[weapon]</u> grows hot in your hand, until you are forced to drop it. Whatever power inhabits this blade appears to be unhappy with you. Touching it gingerly, you realize it is no longer hot, but as soon as you go to grab the hilt, it nearly burns you.\n\nYou realize you won't be able to use it right now, but you could probably keep it in your inventory.</b>\n\n");
SceneLib.inventory.takeItem(player.setWeapon(WeaponLib.FISTS), playerMenu);
//Drop beautiful bow if corrupted!
if (player.weaponRange == CoC.instance.weaponsrange.BEA_BOW && player.cor >= (33 + player.corruptionTolerance())) {
EngineCore.outputText("<b>\nThe <u>[weaponrange]</u> grows hot in your hand, until you are forced to drop it. Whatever power inhabits this range weapon appears to be unhappy with you. Touching it gingerly, you realize it is no longer hot, but as soon as you go to grab the riser, it nearly burns you.\n\nYou realize you won't be able to use it right now, but you could probably keep it in your inventory.</b>\n\n");
SceneLib.inventory.takeItem(player.setWeaponRange(WeaponRangeLib.NOTHING), playerMenu);
return true;
}
//Drop beautiful shield if corrupted!
if (player.shield == CoC.instance.shields.BSHIELD && player.cor >= (33 + player.corruptionTolerance())) {
EngineCore.outputText("<b>\nThe <u>[shield]</u> grows hot in your hand, until you are forced to drop it. Whatever power inhabits this shield appears to be unhappy with you. Touching it gingerly, you realize it is no longer hot, but as soon as you go to grab the enarmes, it nearly burns you.\n\nYou realize you won't be able to use it right now, but you could probably keep it in your inventory.</b>\n\n");
SceneLib.inventory.takeItem(player.setShield(ShieldLib.NOTHING), playerMenu);
return true;
}
//Drop scarred blade if not corrupted enough!
Expand Down
Loading

0 comments on commit 0619a1a

Please sign in to comment.