Merge pull request #181 from Ormael7/master-wip

Master wip
Ormael7 · Oct 31, 2020 · cae69a1 · cae69a1
2 parents 797cc9e + ec606b8
commit cae69a1
Show file tree

Hide file tree

Showing 413 changed files with 50,350 additions and 39,446 deletions.
diff --git a/.idea/flexCompiler.xml b/.idea/flexCompiler.xml
diff --git a/Corruption-of-Champions-FD-STANDALONE.as3proj b/Corruption-of-Champions-FD-STANDALONE.as3proj
@@ -4,7 +4,7 @@
   <output>
     <movie outputType="Application" />
     <movie input="" />
-    <movie path="..\..\Desktop\CoC_Xianxia_0.8n10.swf" />
+    <movie path="..\..\Desktop\CoC_Xianxia_0.8o.swf" />
     <movie fps="24" />
     <movie width="1000" />
     <movie height="800" />

diff --git a/classes/classes/Appearance.as b/classes/classes/Appearance.as
@@ -86,6 +86,7 @@ public class Appearance extends Utils
 				else if (i_creature.hairType == Hair.SILKEN) description += "silk-like ";
 				else if (i_creature.hairType == Hair.BURNING) description += "burning ";
 				else if (i_creature.hairType == Hair.SNOWY) description += "snowy ";
+				else if (i_creature.hairType == Hair.CRAZY) description += "crazy ";
 				description += "mane";
 				if (i_creature.hairType == Hair.STORM) description += ". The tips ends with glowing lightning shaped locks";
 				return description;
@@ -108,6 +109,7 @@ public class Appearance extends Utils
 			else if (i_creature.hairType == Hair.GRASS) description += "grass-";
 			else if (i_creature.hairType == Hair.SILKEN) description += "silk-like ";
 			else if (i_creature.hairType == Hair.SNOWY) description += "snowy ";
+			else if (i_creature.hairType == Hair.CRAZY) description += "crazy ";
 			if (i_creature.hairType == Hair.BURNING) description += "mane of fire that burns things only when you wish it to";
 			else description += "hair";
 			if (i_creature.hairType == Hair.STORM) description += ". The tips ends with glowing lightning shaped locks";
@@ -172,6 +174,21 @@ public class Appearance extends Utils
 			return description;
 		}
 
+		public static function hairStyleDescription(i_creature:Creature):String
+		{
+			var description:String = "";
+			var options:Array;
+			//
+			if (i_creature.hairStyle == 0) description += "plain";
+			else if (i_creature.hairStyle == 1) description += "wild";
+			else if (i_creature.hairStyle == 2) description += "ponytail";
+			else if (i_creature.hairStyle == 3) description += "Long tied up";
+			else if (i_creature.hairStyle == 4) description += "twin pigtail";
+			else if (i_creature.hairStyle == 5) description += "dwarven";
+
+			return description;
+		}
+
 		/**
 		 * Describe tongue. Monsters don't have tongues, apparently.
 		 * @param    i_character Either Player or NonPlayer
@@ -852,6 +869,12 @@ public class Appearance extends Utils
 					"four-headed cock",
 					"four-headed dick");
 			}
+			else if (cockType == CockTypesEnum.USHI_ONI) {
+				return randomChoice("starfish tipped shaft",
+					"starfish tipped cock",
+					"starfish tipped dick",
+					"starfish tipped penis");
+			}
 			return randomChoice("cock",
 				"prick",
 				"pecker",
@@ -2495,7 +2518,8 @@ public class Appearance extends Utils
 					[Hair.GRASS, "grass"],
 					[Hair.SILKEN, "silk-like"],
 					[Hair.STORM, "glowing lightning shaped"],
-					[Hair.SNOWY, "snowy"]
+					[Hair.SNOWY, "snowy"],
+					[Hair.FAIRY, "otherworldly, silk-like and almost translucent"]
 				]
 		);
 		public static const DEFAULT_BEARD_NAMES:Object = createMapFromPairs(
@@ -2558,7 +2582,8 @@ public class Appearance extends Utils
 					[Face.FIRE_SNAIL, "fire snail"],
 					[Face.GHOST, "ghost"],
 					[Face.JIANGSHI, "jiangshi"],
-					[Face.YUKI_ONNA, "yuki onna"]
+					[Face.YUKI_ONNA, "yuki onna"],
+					[Face.FAIRY, "fairy"]
 				]
 		);
 		public static const DEFAULT_TONGUE_NAMES:Object = createMapFromPairs(
@@ -2603,7 +2628,8 @@ public class Appearance extends Utils
 					[Eyes.DISPLACER, "displacer"],
 					[Eyes.FIRE_SNAIL, "fire snail"],
 					[Eyes.GHOST, "ghost"],
-					[Eyes.JIANGSHI, "jiangshi"]
+					[Eyes.JIANGSHI, "jiangshi"],
+					[Eyes.FAIRY, "fairy"]
 				]
 		);
 		public static const DEFAULT_EARS_NAMES:Object = createMapFromPairs(
@@ -2663,7 +2689,8 @@ public class Appearance extends Utils
 					[Horns.ONI_X2, "2 oni"],
 					[Horns.BICORN, "bicorn"],
 					[Horns.GHOSTLY_WISPS, "ghostly wisps"],
-					[Horns.SPELL_TAG, "spell tag"]
+					[Horns.SPELL_TAG, "spell tag"],
+					[Horns.FROSTWYRM, "frost wyrm"]
 				]
 		);
 		public static const DEFAULT_ANTENNAE_NAMES:Object = createMapFromPairs(
@@ -2717,7 +2744,8 @@ public class Appearance extends Utils
 					[Arms.GHOST, "phantom"],
 					[Arms.JIANGSHI, "jiangshi"],
 					[Arms.RAIJU_2, "raiju paws"],
-					[Arms.YUKI_ONNA, "yuki onna"]
+					[Arms.YUKI_ONNA, "yuki onna"],
+					[Arms.FROSTWYRM, "frost wyrm"]
 				]
 		);
 		public static const DEFAULT_TAIL_NAMES:Object = createMapFromPairs(
@@ -2795,7 +2823,8 @@ public class Appearance extends Utils
 					[Wings.FEATHERED_AVIAN, "avian"],
 					[Wings.NIGHTMARE, "leathery"],
 					[Wings.ETHEREAL_WINGS, "etheral tendrils"],
-					[Wings.THUNDEROUS_AURA, "thunderous aura"]
+					[Wings.THUNDEROUS_AURA, "thunderous aura"],
+					[Wings.FAIRY, "fairy"]
 				]
 		);
 		public static const DEFAULT_WING_DESCS:Object = createMapFromPairs(
@@ -2829,7 +2858,8 @@ public class Appearance extends Utils
 					[Wings.NIGHTMARE, "large leathery"],
 					[Wings.ETHEREAL_WINGS, "etheral tendrils"],
 					[Wings.THUNDEROUS_AURA, "thunderous aura"],
-					[Wings.LEVITATION, "levitation"]
+					[Wings.LEVITATION, "levitation"],
+					[Wings.FAIRY, "butterfly"]
 				]
 		);
 		public static const DEFAULT_LOWER_BODY_NAMES:Object = createMapFromPairs(
@@ -2888,7 +2918,8 @@ public class Appearance extends Utils
 					[LowerBody.GHOST, "phantom"],
 					[LowerBody.GHOST_2, "poltergeist"],
 					[LowerBody.JIANGSHI, "jiangshi"],
-					[LowerBody.YUKI_ONNA, "yuki onna"]
+					[LowerBody.YUKI_ONNA, "yuki onna"],
+					[LowerBody.FROSTWYRM, "frost wyrm"]
 				]
 		);
 		// <mod name="Dragon patch" author="Stadler76">

diff --git a/classes/classes/BaseContent.as b/classes/classes/BaseContent.as
@@ -1,5 +1,4 @@
-package classes 
-{
+package classes {
 import classes.CoC;
 import classes.Items.*;
 import classes.Scenes.Camp;
@@ -11,7 +10,6 @@ import classes.Scenes.Inventory;
 import classes.Scenes.Places.Ingnam;
 import classes.Scenes.Places.Prison;
 import classes.Scenes.SceneLib;
-import classes.internals.RootCounters;
 import classes.internals.Utils;
 
 import coc.model.GameModel;
@@ -34,7 +32,7 @@ import coc.xxc.StoryContext;
 	{
         public function BaseContent()
 		{
-			
+
 		}
 
 		protected function cheatTime(time:Number, needNext:Boolean = false):void
@@ -54,6 +52,10 @@ import coc.xxc.StoryContext;
 			return CoC.instance.timeQ;
 		}
 
+		protected function get isNightTime():Boolean {
+			return (model.time.hours <= 5 || model.time.hours >= 21);
+		}
+
 		/*protected function get measurements():Class
 		{
 			return Measurements;
@@ -484,7 +486,7 @@ import coc.xxc.StoryContext;
 		protected function eAssholeDescript():String {
 			return Appearance.assholeDescript(monster);
 		}
-				
+
 		protected function hipDescript():String {
 			return Appearance.hipDescription(player);
 		}
@@ -637,7 +639,7 @@ import coc.xxc.StoryContext;
 			return Appearance.breastCup(val);
 		}
 */
-		
+
 /* Replaced with calls to Appearance.cockDescription
 		protected function NPCCockDescript(cockType:*,cockLength:Number=0,lust:Number=50):String
 		{
@@ -657,7 +659,7 @@ import coc.xxc.StoryContext;
 		 * Also support operators could be appended with + - * /=
 		 * eg: dynStats("str+", 1, "tou-", 2, "spe*", 1.1, "int/", 2, "cor=", 0)
 		 *     will add 1 to str, subtract 2 from tou, increase spe by 10%, decrease int by 50%, and set cor to 0
-		 * 
+		 *
 		 * @param	... args
 		 */
 		protected function dynStats(... args):void
@@ -666,6 +668,21 @@ import coc.xxc.StoryContext;
 			player.dynStats.apply(player, args);
 		}
 
+		protected function MutagenBonus(statName: String, bonus: Number):void
+		{
+			player.MutagenBonus(statName,bonus);
+		}
+
+		protected function AlchemyBonus(statName: String, bonus: Number):void
+		{
+			player.AlchemyBonus(statName,bonus);
+		}
+
+		protected function KnowledgeBonus(statName: String, bonus: Number):void
+		{
+			player.KnowledgeBonus(statName,bonus);
+		}
+
 		protected function silly():Boolean
 		{
 			return EngineCore.silly();
@@ -844,14 +861,14 @@ import coc.xxc.StoryContext;
 			CoC.instance.menuLoc = val;
 		}
 */
-		
+
 /*
 		protected function get itemSlots():Array
 		{
 			return CoC.instance.player.itemSlots;
 		}
 */
-		
+
 /*
 		protected function get itemStorage():Array
 		{
@@ -899,10 +916,6 @@ import coc.xxc.StoryContext;
 			return CoC.instance.flags;
 		}
 
-		protected function get counters():RootCounters {
-			return CoC.instance.counters;
-		}
-
 		protected function set flags(val:DefaultDict):void
 		{
 			CoC.instance.flags = val;
@@ -930,7 +943,7 @@ import coc.xxc.StoryContext;
 
 		protected function buttonTextIsOneOf(index:int, possibleLabels:Array):Boolean {
 			return EngineCore.buttonTextIsOneOf(index, possibleLabels);
-		}		
+		}
 
 		protected function getButtonText(index:int):String {
 			return EngineCore.getButtonText(index);
@@ -939,7 +952,7 @@ import coc.xxc.StoryContext;
 		protected function buttonIsVisible(index:int):Boolean {
 			return EngineCore.buttonIsVisible(index);
 		}
-				
+
 		protected function darkTheme():Boolean {
 			return CoC.instance.mainViewManager.darkThemeImpl();
 		}
@@ -949,22 +962,25 @@ import coc.xxc.StoryContext;
 		protected function get context():StoryContext {
 			return CoC.instance.context;
 		}
-		protected function submenu(buttons:ButtonDataList,back:Function=null,page:int=0):void {
+		protected function submenu(buttons:ButtonDataList,back:Function=null,page:int=0,IsSorted:Boolean = true):void {
 			var list:/*ButtonData*/Array = buttons.list.filter(function(e:ButtonData, i:int, a:Array):Boolean{
 				return e.visible;
-			}).sortOn('text');
+			});
+			if (IsSorted){
+				list.sortOn('text');
+			}
 			menu();
 			var total:int = list.length;
 			var n:int = Math.min(total,(page+1)*12);
 			for (var bi:int = 0,li:int=page*12; li<n; li++,bi++) {
 				list[li].applyTo(button(bi%12));
 			}
 			if (page!=0 || total>12) {
-				button(12).show("Prev Page", curry(submenu, buttons, back, page - 1)).disableIf(page == 0);
-				button(13).show("Next Page", curry(submenu, buttons, back, page + 1)).disableIf(n >= total);
+				button(12).show("Prev Page", curry(submenu, buttons, back, page - 1, IsSorted)).disableIf(page == 0);
+				button(13).show("Next Page", curry(submenu, buttons, back, page + 1, IsSorted)).disableIf(n >= total);
 			}
 			if (back != null) button(14).show("Back",back);
 		}
 	}
 
-}
+}