Skip to content

Commit

Permalink
Merge branch 'master-wip' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ormael7
Ormael7 authored Mar 26, 2018
2 parents 3e4c9f6 + 05fb440 commit 48c73b4
Show file tree
Hide file tree
Showing 90 changed files with 1,939 additions and 811 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.8i.swf" />
<movie path="..\..\Desktop\CoC_Xianxia_0.8i2.swf" />
<movie fps="24" />
<movie width="1000" />
<movie height="800" />
Expand Down
20 changes: 15 additions & 5 deletions classes/classes/Appearance.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2386,6 +2386,7 @@ public class Appearance extends Utils
[Skin.DRAGON_SCALES, "dragon scales", "dragon scales", "", true],
[Skin.MOSS, "moss", "moss", "", false],
[Skin.AQUA_RUBBER_LIKE, "AQUA_RUBBER_LIKE", "slippery rubber-like skin", "", false],
[Skin.FEATHER, "FEATHER", "feather", "", false],
[Skin.TATTOED_ONI, "TATTOED_ONI", "tattooed skin", "", false],
[Skin.PARTIAL_DRAGON_SCALES, "partial dragon scales", "partial dragon scales", "", true],
[Skin.PARTIAL_STONE, "partial stone", "partial stone", "", false],
Expand Down Expand Up @@ -2494,7 +2495,8 @@ public class Appearance extends Utils
[Eyes.ELF, "elf"],
[Eyes.RAIJU, "raiju"],
[Eyes.GEMSTONES, "gemstones"],
[Eyes.FERAL, "feral"]
[Eyes.FERAL, "feral"],
[Eyes.GRYPHON, "gryphon"]
]
);
public static const DEFAULT_EARS_NAMES:Object = createMapFromPairs(
Expand Down Expand Up @@ -2527,7 +2529,8 @@ public class Appearance extends Utils
[Ears.ELVEN, "elven"],
[Ears.WEASEL, "weasel"],
[Ears.RED_PANDA, "red-panda"],
[Ears.AVIAN, "avian"]
[Ears.AVIAN, "avian"],
[Ears.GRYPHON, "gryphon"]
]
);
public static const DEFAULT_HORNS_NAMES:Object = createMapFromPairs(
Expand Down Expand Up @@ -2571,6 +2574,7 @@ public class Appearance extends Utils
[Arms.GARGOYLE_2, "gargoyle"],
[Arms.WOLF, "wolf"],
[Arms.LION, "lion"],
[Arms.SPHINX, "sphinx"],
[Arms.KITSUNE, "kitsune"],
[Arms.FOX, "fox"],
[Arms.LIZARD, "lizard"],
Expand All @@ -2584,7 +2588,8 @@ public class Appearance extends Utils
[Arms.RAIJU, "raiju"],
[Arms.RED_PANDA, "red-panda"],
[Arms.CAT, "cat"],
[Arms.AVIAN, "avian"]
[Arms.AVIAN, "avian"],
[Arms.GRYPHON, "gryphon"]
]
);
public static const DEFAULT_TAIL_NAMES:Object = createMapFromPairs(
Expand Down Expand Up @@ -2617,14 +2622,16 @@ public class Appearance extends Utils
[Tail.KITSHOO, "kitshoo"],
[Tail.MANTIS_ABDOMEN, "mantis abdomen"],
[Tail.WOLF, "wolf"],
[Tail.LION, "lion"],
[Tail.GARGOYLE, "mace-shaped gargoyle"],
[Tail.MANTICORE_PUSSYTAIL, "manticore pussytail"],
[Tail.ORCA, "orca"],
[Tail.YGGDRASIL, "yggdrasil"],
[Tail.RAIJU, "raiju"],
[Tail.RED_PANDA, "red-panda"],
[Tail.GARGOYLE_2, "axe-shaped gargoyle"],
[Tail.AVIAN, "avian"]
[Tail.AVIAN, "avian"],
[Tail.GRIFFIN, "griffin"]
]
);
public static const DEFAULT_WING_NAMES:Object = createMapFromPairs(
Expand All @@ -2645,6 +2652,7 @@ public class Appearance extends Utils
[Wings.DRACONIC_HUGE, "large majestic draconic"],
[Wings.FEATHERED_PHOENIX, "phoenix"],
[Wings.FEATHERED_ALICORN, "alicorn"],
[Wings.FEATHERED_SPHINX, "sphinx"],
[Wings.MANTIS_LIKE_SMALL, "small mantis-like"],
[Wings.MANTIS_LIKE_LARGE, "large mantis-like"],
[Wings.MANTIS_LIKE_LARGE_2, "two large pairs of mantis-like"],
Expand Down Expand Up @@ -2677,6 +2685,7 @@ public class Appearance extends Utils
[Wings.DRACONIC_HUGE, "large, majestic draconic"],
[Wings.FEATHERED_PHOENIX, "large crimson feathered"],
[Wings.FEATHERED_ALICORN, "large white feathered"],
[Wings.FEATHERED_SPHINX, "large feathered"],
[Wings.MANTIS_LIKE_SMALL, "small mantis-like"],
[Wings.MANTIS_LIKE_LARGE, "large mantis-like"],
[Wings.MANTIS_LIKE_LARGE_2, "two large pairs of mantis-like"],
Expand Down Expand Up @@ -2733,7 +2742,8 @@ public class Appearance extends Utils
[LowerBody.ELF, "elf"],
[LowerBody.RAIJU, "raiju"],
[LowerBody.RED_PANDA, "red-panda"],
[LowerBody.AVIAN, "avian"]
[LowerBody.AVIAN, "avian"],
[LowerBody.GRYPHON, "gryphon"]
]
);
// <mod name="Dragon patch" author="Stadler76">
Expand Down
4 changes: 3 additions & 1 deletion classes/classes/BodyParts/Arms.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ public class Arms extends BodyPart {
public static const GARGOYLE_2:int = 24;
public static const CAT:int = 25;
public static const AVIAN:int = 26;

public static const GRYPHON:int = 27;
public static const SPHINX:int = 28;

public function Arms() {
super(null, null);
}
Expand Down
1 change: 1 addition & 0 deletions classes/classes/BodyParts/Ears.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class Ears extends BodyPart {
public static const VAMPIRE:int = 28;
public static const RED_PANDA:int = 29;
public static const AVIAN:int = 30;
public static const GRYPHON:int = 31;

public function Ears() {
super(null, null);
Expand Down
1 change: 1 addition & 0 deletions classes/classes/BodyParts/Eyes.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public class Eyes extends BodyPart {
public static const VAMPIRE:int = 15;
public static const GEMSTONES:int = 16;
public static const FERAL:int = 17;
public static const GRYPHON:int = 18;

public var colour:String = "brown";
public function Eyes() {
Expand Down
1 change: 1 addition & 0 deletions classes/classes/BodyParts/LowerBody.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public class LowerBody extends SaveableBodyPart {
public static const RED_PANDA:int = 42;
public static const GARGOYLE_2:int = 43;
public static const AVIAN:int = 44;
public static const GRYPHON:int = 45;

override public function set type(value:int):void {
super.type = value;
Expand Down
4 changes: 3 additions & 1 deletion classes/classes/BodyParts/Tail.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ public class Tail extends SaveableBodyPart {
public static const RED_PANDA:int = 34;
public static const GARGOYLE_2:int = 35;
public static const AVIAN:int = 36;

public static const GRIFFIN:int = 37;
public static const LION:int = 38;

override public function set type(value:int):void {
var old:int = type;
super.type = value;
Expand Down
1 change: 1 addition & 0 deletions classes/classes/BodyParts/Wings.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ public class Wings extends BodyPart {
public static const FEY_DRAGON_WINGS:int = 26;
public static const FEATHERED_AVIAN:int = 27;
public static const NIGHTMARE:int = 28;
public static const FEATHERED_SPHINX:int = 29;

public var desc:String = "non-existant";
public function Wings() {
Expand Down
25 changes: 15 additions & 10 deletions classes/classes/CharCreation.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ import coc.view.MainView;
player.itemSlot4.emptySlot();
player.itemSlot5.unlocked = false;
player.itemSlot5.emptySlot();
player.itemSlot6.unlocked = false;
player.itemSlot6.emptySlot();
player.itemSlot7.unlocked = false;
player.itemSlot7.emptySlot();
player.itemSlot8.unlocked = false;
player.itemSlot8.emptySlot();
player.itemSlot9.unlocked = false;
player.itemSlot9.emptySlot();
player.itemSlot10.unlocked = false;
player.itemSlot10.emptySlot();
}
//PIERCINGS
player.nipplesPierced = 0;
Expand Down Expand Up @@ -367,11 +377,11 @@ import coc.view.MainView;
}
}
//player.perkPoints = player.level - 1;
var newFlags:DefaultDict = new DefaultDict();
if (flags[kFLAGS.NEW_GAME_PLUS_LEVEL] > 0) {
var newGamePlusLevel:int = flags[kFLAGS.NEW_GAME_PLUS_LEVEL];
var gameMode:Number = flags[kFLAGS.HUNGER_ENABLED];
var hardcoreMode:int = flags[kFLAGS.HARDCORE_MODE];
var hardcoreSlot:String = flags[kFLAGS.HARDCORE_SLOT];
for each(var flag:int in [kFLAGS.NEW_GAME_PLUS_LEVEL, kFLAGS.HUNGER_ENABLED, kFLAGS.HARDCORE_MODE, kFLAGS.GAME_DIFFICULTY, kFLAGS.EASY_MODE_ENABLE_FLAG, kFLAGS.SFW_MODE, kFLAGS.WATERSPORTS_ENABLED, kFLAGS.SILLY_MODE_ENABLE_FLAG, kFLAGS.LOW_STANDARDS_FOR_ALL, kFLAGS.HYPER_HAPPY, kFLAGS.STAT_GAIN_MODE]) {
newFlags[flag] = flags[flag];
}
}
//Clear plot storage array!
CoC.instance.flags = new DefaultDict();
Expand All @@ -380,12 +390,7 @@ import coc.view.MainView;
CoC.instance.counters = new RootCounters(countersStorage);
CoC.instance.saves.loadPermObject();
//Carry over data if new game plus.
if (newGamePlusLevel > 0) {
flags[kFLAGS.NEW_GAME_PLUS_LEVEL] = newGamePlusLevel;
flags[kFLAGS.HUNGER_ENABLED] = gameMode;
flags[kFLAGS.HARDCORE_MODE] = hardcoreMode;
flags[kFLAGS.HARDCORE_SLOT] = hardcoreSlot;
}
if (flags[kFLAGS.NEW_GAME_PLUS_LEVEL] > 0) CoC.instance.flags = newFlags;
//Set that jojo debug doesn't need to run
flags[kFLAGS.UNKNOWN_FLAG_NUMBER_02999] = 3;
//Time reset
Expand Down
5 changes: 3 additions & 2 deletions classes/classes/Character.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ import classes.Items.JewelryLib;

public override function maxFatigue():Number
{
var max:Number = 100;
var max:Number = 150;
if (game.player.alicornScore() >= 6) max += (50 * (1 + flags[kFLAGS.NEW_GAME_PLUS_LEVEL]));
if (game.player.dragonScore() >= 20) max += (100 * (1 + flags[kFLAGS.NEW_GAME_PLUS_LEVEL]));
if (game.player.dragonScore() >= 28) max += (100 * (1 + flags[kFLAGS.NEW_GAME_PLUS_LEVEL]));
Expand Down Expand Up @@ -672,6 +672,7 @@ import classes.Items.JewelryLib;
if (game.player.alicornScore() >= 6) max += (150 * (1 + flags[kFLAGS.NEW_GAME_PLUS_LEVEL]));//przenieść do mnożnika?
if (game.player.unicornScore() >= 5) max += (50 * (1 + flags[kFLAGS.NEW_GAME_PLUS_LEVEL]));//przenieść do mnożnika?
if (hasPerk(PerkLib.DemonicLethicite)) max += Math.round(lib);
if (hasPerk(PerkLib.Metamorph)) max += 50;
if (flags[kFLAGS.SOUL_CULTIVATION] >= 2) max += 25;
if (flags[kFLAGS.SOUL_CULTIVATION] >= 3) max += 25;
if (flags[kFLAGS.SOUL_CULTIVATION] >= 4) max += 30;
Expand Down Expand Up @@ -836,7 +837,7 @@ import classes.Items.JewelryLib;

public override function maxMana():Number
{
var max:Number = 100;
var max:Number = 200;
if (findPerk(PerkLib.ManaAffinityI) >= 0) max += 35;
if (findPerk(PerkLib.ManaAffinityII) >= 0) max += 35;
if (findPerk(PerkLib.ManaAffinityIII) >= 0) max += 35;
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 @@ -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.8i";
version = ver + " (<b>Project 8 (Part 2: Luna, Diana, Sidonie), Avian TF, few new weapons, Healer path, small fixes)</b>)";
ver = "1.0.2_mod_Xianxia_0.8i2";
version = ver + " (<b></b>)";

this.images = new ImageManager(stage, mainView);
this.inputManager = new InputManager(stage, mainView, false);
Expand Down
1 change: 1 addition & 0 deletions classes/classes/CockTypesEnum.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ package classes
public static const WOLF:CockTypesEnum = new CockTypesEnum("mammal");
public static const STAMEN:CockTypesEnum = new CockTypesEnum("plant");
public static const RED_PANDA:CockTypesEnum = new CockTypesEnum("mammal");
public static const GRYPHON:CockTypesEnum = new CockTypesEnum("avian");
public static const UNDEFINED:CockTypesEnum = new CockTypesEnum("");

function CockTypesEnum(i_group:String = "") { _group = i_group; }
Expand Down
Loading

0 comments on commit 48c73b4

Please sign in to comment.