Skip to content

Commit

Permalink
Mod update 1.3.19
Browse files Browse the repository at this point in the history
More tweaks and fixes
  • Loading branch information
Kitteh6660 committed Apr 17, 2016
1 parent d3d4c7e commit d74f3ac
Show file tree
Hide file tree
Showing 8 changed files with 182 additions and 73 deletions.
2 changes: 1 addition & 1 deletion classes/classes/CoC.as
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ the text from being too boring.
//model.debug = debug; // TODO: Set on model?

//Version NUMBER
ver = "1.0.2_mod_1.3.18";
ver = "1.0.2_mod_1.3.19";
version = ver + " (<b>More Fixes</b>)";

//Indicates if building for mobile?
Expand Down
24 changes: 24 additions & 0 deletions classes/classes/PlayerEvents.as
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,9 @@ package classes {
//Clear dragon breath cooldown!
if (player.findStatusEffect(StatusEffects.DragonBreathCooldown) >= 0) player.removeStatusEffect(StatusEffects.DragonBreathCooldown);
}
if (flags[kFLAGS.WEATHER_CHANGE_COOLDOWN] > 0) {
flags[kFLAGS.WEATHER_CHANGE_COOLDOWN]--;
}
return needNext;
}

Expand Down Expand Up @@ -1006,6 +1009,27 @@ package classes {
getGame().forest.beeGirlScene.beeSexForCocks(false);
return true;
}
if (flags[kFLAGS.GAME_END] > 0 && flags[kFLAGS.WEATHER_CHANGE_COOLDOWN] <= 0) {
var randomWeather:int = rand(100);
flags[kFLAGS.WEATHER_CHANGE_COOLDOWN] = 6 + rand(48);
if (randomWeather < 40) { //Clear
flags[kFLAGS.CURRENT_WEATHER] = 0;
}
else if (randomWeather >= 40 && randomWeather < 60) { //A few clouds
flags[kFLAGS.CURRENT_WEATHER] = 1;
}
else if (randomWeather >= 60 && randomWeather < 80) { //Cloudy
flags[kFLAGS.CURRENT_WEATHER] = 2;
}
else if (randomWeather >= 80 && randomWeather < 96) { //Rainy
flags[kFLAGS.CURRENT_WEATHER] = 3;
flags[kFLAGS.WEATHER_CHANGE_COOLDOWN] /= 2;
}
else if (randomWeather >= 96) { //Thunderstorm
flags[kFLAGS.CURRENT_WEATHER] = 4;
flags[kFLAGS.WEATHER_CHANGE_COOLDOWN] /= 3;
}
}
return false;
}
//End of Interface Implementation
Expand Down
81 changes: 57 additions & 24 deletions classes/classes/Scenes/Areas/Mountain/Salon.as
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,13 @@ private function favoriteSalonMenu():void {
private function salonFavoritesPaymentMenu():void {
menu();
if (flags[kFLAGS.LYNNETTE_PREGNANCY_CYCLE] >= 4 && player.hasCock()) addButton(5,"Fuck Goblin",fuckLynnette);
if (player.hasCock()) addButton(0,"Goblin Blow",goblinHairDresserFacefuck);
addButton(1,"Canine",gloryholeDoggie);
addButton(2,"Imp",gloryholeImp);
addButton(3,"Minotaur",gloryholeMinotaur);
addButton(4,"Incubus",gloryholeIncubus);
if (flags[kFLAGS.UNKNOWN_FLAG_NUMBER_00142] > 0) addButton(8,"Buy MinoCum",buyMinoCum);
if (player.hasCock()) addButton(0, "Goblin Blow", goblinHairDresserFacefuck, null, null, null, "Let Lynnette suck you off.");
addButton(1, "Canine", gloryholeDoggie, null, null, null, "Suck that knotted cock.");
addButton(2, "Imp", gloryholeImp, null, null, null, "Suck that demonic cock. Judging from the constant bobbing, someone must have been trying hard to hover at the right height.");
addButton(3, "Minotaur", gloryholeMinotaur, null, null, null, "Suck that huge minotaur cock!");
addButton(4, "Incubus", gloryholeIncubus, null, null, null, "Suck that incubus cock. It gives off that pleasant spicy scent.");
if (flags[kFLAGS.UNKNOWN_FLAG_NUMBER_00142] > 0) addButton(8, "Buy MinoCum", buyMinoCum, null, null, null, "Buy a bottle of minotaur cum for 60 gems?");
if (player.hasItem(consumables.MINOCUM) || player.hasItem(consumables.P_M_CUM) || player.hasItem(consumables.URTACUM) || player.hasItem(consumables.BHMTCUM)) addButton(9, "Give Cum", giveCumOptions);
addButton(14,"Back",favoriteSalonMenu);
}

Expand All @@ -72,27 +73,28 @@ private function salonPaymentMenu():void {
addButton(3, "Minotaur", gloryholeMinotaur, null, null, null, "Suck that huge minotaur cock!");
addButton(4, "Incubus", gloryholeIncubus, null, null, null, "Suck that incubus cock. It gives off that pleasant spicy scent.");
if (flags[kFLAGS.UNKNOWN_FLAG_NUMBER_00142] > 0) addButton(8, "Buy MinoCum", buyMinoCum, null, null, null, "Buy a bottle of minotaur cum for 60 gems?");
if (player.hasItem(consumables.MINOCUM) || player.hasItem(consumables.P_M_CUM) || player.hasItem(consumables.URTACUM) || player.hasItem(consumables.BHMTCUM)) addButton(9, "Give Cum", giveCumOptions);
addButton(14, "Leave", camp.returnToCampUseOneHour);
}

private function buyMinoCum():void{
if (player.gems < 60)
{
outputText("You can't afford any minotaur cum right now!", true);
if (flags[kFLAGS.SALON_PAID] == 0)
doNext(salonGreeting);
else
salonPurchaseMenu();
}
else
{
player.gems -= 60;
outputText("You happily give Lynnette 60 gems and pick up the bottle full of glistening, heavenly cum. ", true);
statScreenRefresh();
inventory.takeItem(consumables.MINOCUM, camp.returnToCampUseOneHour);
}
}
private function buyMinoCum():void{
if (player.gems < 60)
{
outputText("You can't afford any minotaur cum right now!", true);
if (flags[kFLAGS.SALON_PAID] == 0)
doNext(salonGreeting);
else
salonPurchaseMenu();
}
else
{
player.gems -= 60;
outputText("You happily give Lynnette 60 gems and pick up the bottle full of glistening, heavenly cum. ", true);
statScreenRefresh();
inventory.takeItem(consumables.MINOCUM, camp.returnToCampUseOneHour);
}
}

public function salonPurchaseMenu():void {
flags[kFLAGS.SALON_PAID] = 1;
spriteSelect(38);
Expand Down Expand Up @@ -316,6 +318,37 @@ private function gloryholeMinotaur(): void {
doNext(hairDressingMainMenu);
}

private function giveCumOptions():void {
menu();
if (player.hasItem(consumables.MINOCUM) || player.hasItem(consumables.P_M_CUM)) {
addButton(0, "Minotaur", giveCumToLynnette, 0);
}
if (player.hasItem(consumables.URTACUM)) {
addButton(1, "Urta's", giveCumToLynnette, 1);
}
if (player.hasItem(consumables.BHMTCUM)) {
addButton(2, "Behemoth's", giveCumToLynnette, 2);
}
addButton(4, "Back", salonPaymentMenu);
}

private function giveCumToLynnette(type:int):void {
outputText("You show Lynnette the bottle of " + (type == 0 ? "minotaur" : (type == 1 ? "Urta's" : "Behemoth's")) + " cum. Lynnette gingerly takes the bottle from you and says, \"<i>I'll gladly accept those, thanks. Now what can I do for you?</i>\"");
if (type == 0) { //Minotaur Cum
if (player.hasItem(consumables.MINOCUM))
player.destroyItems(consumables.MINOCUM, 1);
else
player.destroyItems(consumables.P_M_CUM, 1);
}
else if (type == 1) { //Urta's Cum
player.destroyItems(consumables.URTACUM, 1);
}
else { //Behemoth's Cum
player.destroyItems(consumables.BHMTCUM, 1);
}
salonPurchaseMenu();
}

private function goblinHairDresserFacefuck():void {
spriteSelect(38);
outputText(images.showImage("lynnette-blowjob"));
Expand Down
64 changes: 58 additions & 6 deletions classes/classes/Scenes/Camp.as
Original file line number Diff line number Diff line change
Expand Up @@ -693,20 +693,72 @@ private function doCamp():void { //Only called by playerMenu
//Set up rest stuff
//Night
if (model.time.hours < 6 || model.time.hours > 20) {
if (flags[kFLAGS.LETHICE_DEFEATED] <= 0) outputText("It is dark out, made worse by the lack of stars in the sky. A blood-red moon hangs in the sky, seeming to watch you, but providing little light. It's far too dark to leave camp.\n\n", false);
else outputText("It is dark out. Stars dot the night sky. A blood-red moon hangs in the sky, seeming to watch you, but providing little light. It's far too dark to leave camp.\n\n", false);
if (flags[kFLAGS.GAME_END] == 0) { //Lethice not defeated
outputText("It is dark out, made worse by the lack of stars in the sky. A blood-red moon hangs in the sky, seeming to watch you, but providing little light. It's far too dark to leave camp.\n\n");
}
else { //Lethice defeated, proceed with weather
switch(flags[kFLAGS.CURRENT_WEATHER]) {
case 0:
case 1:
outputText("It is dark out. Stars dot the night sky. A blood-red moon hangs in the sky, seeming to watch you, but providing little light. It's far too dark to leave camp.\n\n");
break;
case 2:
outputText("It is dark out. The sky is covered by clouds and you could faintly make out the red spot in the clouds which is presumed to be the moon. It's far too dark to leave camp.\n\n");
break;
case 3:
outputText("It is dark out. The sky is covered by clouds raining water upon the ground. It's far too dark to leave camp.\n\n");
break;
case 4:
outputText("It is dark out. The sky is covered by clouds raining water upon the ground and occasionally the sky flashes with lightning. It's far too dark to leave camp.\n\n");
break;
default:
outputText("It is dark out. Stars dot the night sky. A blood-red moon hangs in the sky, seeming to watch you, but providing little light. It's far too dark to leave camp.\n\n");
}
}
if (companionsCount() > 0 && !(model.time.hours > 4 && model.time.hours < 23)) {
outputText("Your camp is silent as your companions are sleeping right now.\n", false);
outputText("Your camp is silent as your companions are sleeping right now.\n");
}
exploreEvent = null;
placesEvent = null;
}
//Day Time!
else {
if (model.time.hours == 19) outputText("The sun is close to the horizon, getting ready to set. ", false);
if (model.time.hours == 20) outputText("The sun has already set below the horizon. The sky glows orange. ", false);
outputText("It's light outside, a good time to explore and forage for supplies with which to fortify your camp.\n", false);
if (flags[kFLAGS.GAME_END] > 0) { //Lethice defeated
switch(flags[kFLAGS.CURRENT_WEATHER]) {
case 0:
outputText("The sun shines brightly, illuminating the now-blue sky. ");
break;
case 1:
outputText("The sun shines brightly, illuminating the now-blue sky. Occasional clouds dot the sky, appearing to form different shapes. ");
break;
case 2:
outputText("The sky is light gray as it's covered by the clouds. ");
break;
case 3:
outputText("The sky is fairly dark as it's covered by the clouds that rain water upon the lands. ");
break;
case 4:
outputText("The sky is dark as it's thick with dark grey clouds that rain and occasionally the sky flashes with lightning. ");
break;
}
}
if (model.time.hours == 19) {
if (flags[kFLAGS.CURRENT_WEATHER] < 2)
outputText("The sun is close to the horizon, getting ready to set. ");
else
outputText("Though you cannot see the sun, the sky began to glow orange. ");
}
if (model.time.hours == 20) {
if (flags[kFLAGS.CURRENT_WEATHER] < 2)
outputText("The sun has already set below the horizon. The sky glows orange. ");
else
outputText("Even with the clouds, the sky is glowing bright orange. The sun may have already set at this point. ");
}
outputText("It's light outside, a good time to explore and forage for supplies with which to fortify your camp.\n");

}
//Weather!


//Unlock cabin.
if (flags[kFLAGS.CAMP_CABIN_PROGRESS] <= 0 && model.time.days >= 14)
Expand Down
2 changes: 1 addition & 1 deletion classes/classes/Scenes/Masturbation.as
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ package classes.Scenes {
doNext(playerMenu);
return;
}
if (player.hasCock() && (player.cocks[0].cockType == CockTypesEnum.BEE) && !inDungeon) {
if (player.hasCock() && (player.cocks[0].cockType == CockTypesEnum.BEE) && !(player.hasItem(consumables.BEEHONY) || player.hasItem(consumables.PURHONY) || player.hasItem(consumables.SPHONEY)) && !inDungeon) {
outputText("Although your bee cock aches you know that there's no way for you to get relief on your own. When you touch your shaft or think about cumming images of the bee girl and the sound of her hypnotic buzzing fill your mind.");
doNext(playerMenu);
return;
Expand Down
13 changes: 1 addition & 12 deletions classes/classes/Scenes/NPCs/EmberScene.as
Original file line number Diff line number Diff line change
Expand Up @@ -211,19 +211,9 @@ package classes.Scenes.NPCs
if (emberAffection() <= 25) outputText("Ember sighs as you approach, and doesn't even look you in the eye before speaking. \"<i>What do you want?</i>\"");
//Moderate Affection:
else if (emberAffection() <= 75) outputText("Ember fidgets as " + emberMF("his", "her") + " tail starts to sway from side to side, " + emberMF("he", "she") + " looks at you and asks, \"<i>What is it?</i>\"");
//High Affection:
else outputText("Ember's eyes light up as you close in on " + emberMF("him", "her") + ", and " + emberMF("he", "she") + " smiles nervously. \"<i>Y-Yes?</i>\"");
//OPTIONS HERE
//[APPEARANCE]
/*Talk (always available)
Egg (get a dragon egg, available if she has a pussy and received Ovi Elixir before hatching) (unlimited times/day)
Milk (get dragon milk, available if " + emberMF("he","she") + " has received Lactaid before hatching.) (unlimited times/day)
Blood (get dragon blood, always available) (1 time/day)
Sex (have sex, always available)
Spar (fight Ember)*/
//var egg:Function =null;
//var milk:Function =null;
//if ((flags[kFLAGS.EMBER_OVIPOSITION] > 0 || player.hasItem(consumables.OVIELIX, 1)) && flags[kFLAGS.EMBER_GENDER] >= 2 && !pregnancy.isPregnant) egg = emberIsAnEggFactory;
//if (flags[kFLAGS.EMBER_MILK] > 0 /* || (player.hasItem(consumables.LACTAID, 1) && flags[kFLAGS.EMBER_AFFECTION] >= 50)*/) milk = getMilkFromEmber;
menu();
addButton(0, "Appearance", embersAppearance, null, null, null, "Examine Ember's appearance.");
addButton(1, "Talk", talkToEmber, null, null, null, "Talk to Ember about some topics.");
Expand All @@ -237,7 +227,6 @@ package classes.Scenes.NPCs
else addButton(7, "Sleep With", sleepWithEmber, null, null, null, "Spend the night with Ember.");
}
addButton(14, "Back", camp.campFollowers);
//choices("Appearance", embersAppearance, "Talk", talkToEmber, "DrinkBlood", bloodForTheBloodGod, "Drink Milk", milk, "Get Egg", egg, "Sex", emberSexMenu, "Spar", decideToSparEmbra, "", 0, "", 0, "Back", 74);
}

//Approach for sex - initial output when selecting [Sex] menu (Z)
Expand Down
5 changes: 1 addition & 4 deletions classes/classes/Scenes/Places/TelAdre.as
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,7 @@ private function armorShops():void {
addButton(2, "Tailor", tailorShoppe);
addButton(3, "Weapons", weaponShop);
addButton(4, "Jewelry", jewelShopEntry);
if (flags[kFLAGS.LOPPE_PC_MET_UMA] == 1)
{
addButton(5, "Clinic", umasShop.enterClinic);
}
addButton(5, "Clinic", umasShop.enterClinic);
if (flags[kFLAGS.CAMP_CABIN_PROGRESS] >= 4)
{
addButton(6, "Carpenter", carpentryShopEntry);
Expand Down
Loading

0 comments on commit d74f3ac

Please sign in to comment.