Skip to content

Commit

Permalink
Mod update 1.3.16
Browse files Browse the repository at this point in the history
Closed #127, Closed #144, Closed #182

Also changed the font for stats bars.
  • Loading branch information
Kitteh6660 committed Apr 3, 2016
1 parent b950297 commit 2561e7e
Show file tree
Hide file tree
Showing 17 changed files with 1,407 additions and 55 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.15";
ver = "1.0.2_mod_1.3.16";
version = ver + " (<b>Nostalgia Ahoy</b>)";

//Indicates if building for mobile?
Expand Down
2 changes: 1 addition & 1 deletion classes/classes/Scenes/Areas/Forest.as
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ package classes.Scenes.Areas
break;
case 1:
case 2:
outputText("You find a pill stamped with the letter 'H' discarded on the ground.");
outputText("You find a pill stamped with the letter 'H' discarded on the ground. ");
inventory.takeItem(consumables.H_PILL, camp.returnToCampUseOneHour);
break;
case 3:
Expand Down
5 changes: 1 addition & 4 deletions classes/classes/Scenes/Areas/Forest/Essrayle.as
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,7 @@ public function essrayleMeetingI():void {
}
flags[kFLAGS.MET_ESSY]++;
//[Yes] [No]
menu();
addButton(1,"Yes",plantsForMe);
addButton(2,"No",noPlantsForMe);

doYesNo(plantsForMe, noPlantsForMe);
}

//>If No
Expand Down
16 changes: 7 additions & 9 deletions classes/classes/Scenes/Areas/Mountain.as
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ package classes.Scenes.Areas
{
player.exploredMountain++;
var chooser:Number = rand(5);
if (chooser == 5 && player.level < 3 && model.time.days < 20) //Disable mimic if requirements not met (Can still be encountered in level 1 run)
chooser = rand(4);
//Helia monogamy fucks
if (flags[kFLAGS.PC_PROMISED_HEL_MONOGAMY_FUCKS] == 1 && flags[kFLAGS.HEL_RAPED_TODAY] == 0 && rand(10) == 0 && player.gender > 0 && !kGAMECLASS.helScene.followerHel()) {
kGAMECLASS.helScene.helSexualAmbush();
Expand Down Expand Up @@ -83,7 +85,7 @@ package classes.Scenes.Areas
return;
}
//10% chance of hairdresser encounter if not found yet
if (rand(10) == 0 && player.findStatusEffect(StatusEffects.HairdresserMeeting) < 0) chooser = 4;
if (rand(10) == 0 && player.findStatusEffect(StatusEffects.HairdresserMeeting) < 0) chooser = 5;
if ((rand(8) == 0 && flags[kFLAGS.MARAE_QUEST_START] >= 1) && flags[kFLAGS.FACTORY_FOUND] <= 0) {
trace("Dungeon start!")
kGAMECLASS.dungeons.enterFactory();
Expand All @@ -108,10 +110,6 @@ package classes.Scenes.Areas
minotaurScene.minoAddictionBadEndEncounter();
return;
}
//Disable mimic if requirements not met (Can still be encountered in level 1 run)
if (chooser == 5 && player.level < 3 && model.time.days < 20) {
chooser = rand(4);
}
//Generic Goblin/Imp encounter
if (chooser == 0) {
kGAMECLASS.exploration.genericGobImpEncounters();
Expand Down Expand Up @@ -261,13 +259,13 @@ package classes.Scenes.Areas
}
hellHoundScene.hellhoundEncounter();
}
//Hairdresser
//Mimic
if (chooser == 4) {
salon.hairDresser();
getGame().mimicScene.mimicTentacleStart(2);
}
//Mimic
//Hairdresser
if (chooser == 5) {
getGame().mimicScene.mimicTentacleStart(2);
salon.hairDresser();
}
}

Expand Down
14 changes: 11 additions & 3 deletions classes/classes/Scenes/Camp.as
Original file line number Diff line number Diff line change
Expand Up @@ -1865,10 +1865,14 @@ public function badEndGIANTBALLZ():void {
outputText("\n\nFortunately, you have some Reducto. You can shrink your balls and get back to your adventures!", false)
addButton(1, "Reducto", applyReductoAndEscapeBadEnd);
}
else if (player.findStatusEffect(StatusEffects.CampRathazul) >= 0) {
if (player.findStatusEffect(StatusEffects.CampRathazul) >= 0) {
outputText("\n\nYou could call for Rathazul to help you.", false)
addButton(2, "Rathazul", callRathazulAndEscapeBadEnd);
}
if (shouldraFollower.followerShouldra()) {
outputText("\n\nYou could call for Shouldra to shrink your monstrous balls.", false)
addButton(3, "Shouldra", shouldraFollower.shouldraReductosYourBallsUpInsideYa, true);
}
else getGame().gameOver();
}
private function applyReductoAndEscapeBadEnd():void {
Expand Down Expand Up @@ -2104,13 +2108,16 @@ public function wakeFromBadEnd():void {
outputText("\n\nYou realize the consequences of having oversized balls and you NEED to shrink it right away. Reducto will do.");
player.ballSize = (14 + (player.str / 2) + (player.tallness / 4));
}
outputText("\n\nYou get up, still feeling traumatized from the nightmares.");
if (flags[kFLAGS.EASY_MODE_ENABLE_FLAG] > 0 || debug)
outputText("\n\nYou get up, still feeling confused from the nightmares.");
else
outputText("\n\nYou get up, still feeling traumatized from the nightmares.");
//Skip time forward
model.time.days++;
if (flags[kFLAGS.BENOIT_CLOCK_BOUGHT] > 0) model.time.hours = flags[kFLAGS.BENOIT_CLOCK_ALARM];
else model.time.hours = 6;
//Set so you're in camp.
kGAMECLASS.inDungeon = false;
inDungeon = false;
inRoomedDungeon = false;
inRoomedDungeonResume = null;
getGame().inCombat = false;
Expand All @@ -2121,6 +2128,7 @@ public function wakeFromBadEnd():void {
//PENALTY!
var penaltyMultiplier:int = 1;
penaltyMultiplier += flags[kFLAGS.GAME_DIFFICULTY] * 0.5;
if (flags[kFLAGS.EASY_MODE_ENABLE_FLAG] > 0 || debug) penaltyMultiplier = 0;
//Deduct XP and gems.
player.gems -= int((player.gems / 10) * penaltyMultiplier);
player.XP -= int((player.level * 10) * penaltyMultiplier);
Expand Down
2 changes: 1 addition & 1 deletion classes/classes/Scenes/Dungeons/D3/Lethice.as
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ package classes.Scenes.Dungeons.D3

private function gropehands():void
{
outputText("<i>“Let’s see how you fight while you’re being groped, shall we? A shame Pigby isn’t around to see how I’ve improved his hands,”</i> Lethice murmurs. Cupping her hands into a parody of lecher’s grip, the corruptive Queen squeezes and chants. Immediately, you feel phantasmal hands all over your body, reaching through your armor to fondle your bare [skinFurScalesNoun]. Digits slip into your [butt]. Fingertips brush your [nipples]. Warm palms slide down your quivering belly toward your vulnerable loins.");
outputText("<i>“Let’s see how you fight while you’re being groped, shall we? A shame Pigby isn’t around to see how I’ve improved his hands,”</i> Lethice murmurs. Cupping her hands into a parody of lecher’s grip, the corruptive Queen squeezes and chants. Immediately, you feel phantasmal hands all over your body, reaching through your armor to fondle your bare [skinFurScales]. Digits slip into your [butt]. Fingertips brush your [nipples]. Warm palms slide down your quivering belly toward your vulnerable loins.");
outputText("\n\nYou glare daggers at Lethice, but she merely laughs. <i>“A shame I never got to convince him that his hands were so much more effective when used like this.”</i>");
game.dynStats("lus",5);
player.createStatusEffect(StatusEffects.PigbysHands,0,0,0,0);
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/Scenes/Dungeons/D3/LethiceScenes.as
Original file line number Diff line number Diff line change
Expand Up @@ -836,10 +836,10 @@ package classes.Scenes.Dungeons.D3
}
else if (method == 1) {
outputText("Lethice probably deserves a punishment that would fit her foul deeds indeed. You raise your [weapon] and slice through her neck, causing her head to fall to the floor and demonic blood spills forth. You pick up your prize and show it to the demons to let them know not to mess with you. ");
awardAchievement("Off With Her Head!", kACHIEVEMENTS.GENERAL_OFF_WITH_HER_HEAD, true, true, true);
flags[kFLAGS.LETHICE_KILLED] = 2; // 2 indicates Lethice beheaded
}
outputText("The assembled demons scatter at the sight, fearful they’ll fall next - and rightly so. So long as they remain, there’s always the chance another will take her place.");
if (method == 1) awardAchievement("Off With Her Head!", kACHIEVEMENTS.GENERAL_OFF_WITH_HER_HEAD, true, true, false);
postTheChoice();
}

Expand Down Expand Up @@ -1211,7 +1211,7 @@ package classes.Scenes.Dungeons.D3
outputText("You may have defeated Lethice and completed the main story but the fun isn't over! It's time for you to return to the game and begin a new era of Mareth.");
outputText("\n\n<b>You can now ascend if you like. Search for the book in the ruined cathedral and perform the ritual at your camp.</b>");
awardAchievement("Demon Slayer", kACHIEVEMENTS.STORY_FINALBOSS, true, true, false);
if (player.level <= 1) awardAchievement("Ultimate Noob", kACHIEVEMENTS.CHALLENGE_ULTIMATE_NOOB, true, true, false);
if (player.level <= 1) awardAchievement("Ultimate Noob", kACHIEVEMENTS.CHALLENGE_ULTIMATE_NOOB, true, true, false); //Lethice beaten at level 1!
inDungeon = false;
inRoomedDungeon = false;
player.HP = player.maxHP();
Expand Down
Loading

0 comments on commit 2561e7e

Please sign in to comment.