Skip to content

Commit

Permalink
Merge pull request #88 from Ormael7/master-wip
Browse files Browse the repository at this point in the history 
0.8l fix
  • Loading branch information
@Ormael7
Ormael7 authored Feb 6, 2019
2 parents 445d392 + 8e8bcc2 commit c9b753d
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 9 deletions.
20 changes: 17 additions & 3 deletions classes/classes/Scenes/Changelog.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ package classes.Scenes
}
private function Changelog25():void {
clearOutput();
outputText("(Part 2/2) <b>Version 0.8l:</b>\n\n");
outputText("(Part 2/2) <b>Version 0.8l (New Lunar Year mini-event + pig/boar/elf TF's rework, orc + displacer beast TF, 2 new areas + new enemies, Job: Gunslinger perk line, Perk-o-calipse 4 (77 perks), Achiev-o-calipse (over 70 new achievs), The Unicorn Daughter Strikes Back (Yes Celess is Back)):</b>\n\n");
outputText("-New area to find and explore: Caves. PC need to be lvl 30+ and can be found by using Explore option.\n");//Glacial Rift and Vulcanic Crag are now found by exploring Caves.
outputText("-New area to find and explore: Outer Battlefield. PC need to be lvl 5+ and can be found by using Explore option. Finding this area will now replace finding desert in req. to find mountains. This area is populated by group type enemies so either PC strong enough to deal with them without any aoe skills or need to get at least one aoe type of attacks.\n");
outputText("-New enemy added to Glacial Rift: Young Frost Giant - lvl 49. Frost Giant been buffed in attacks effects and stats to match his new lvl 80 status.\n");
Expand Down Expand Up @@ -84,9 +84,15 @@ package classes.Scenes
outputText("-Fixed bugs: missing toogle for lightning and darkness arrows, missing feminity meter on stats page, satyr tf not unlocking relevant metamorph options, cat tf's not unlocking fur option in metamorph, bee wings tf only triggering from no wings or demon wings, demon/devil tf only tf-ing specific type of wings, not working vampire face metamorph option, no menu after defeating ");
outputText("phoenix outside the tower when PC lust was above 33, Dominika spell learning error msg, T.Golems 3 and 5 send option error in picking cores, some weapon not counting toward using whirlwind, Cleave special usable before learning it and having no fatigue cost, magical soulskills still scaling of intelligence, Focused Mind improperly affecting min backfire chance, Crinos Shape ");
outputText("and Dwarf Rage specials not increasing current HP proportional to max HP, ivory inlaid arquebus not loading ammo at combat start or reloading ammo during combat, Hardcore save slot number not kept during ascension, Deep Cave Pod bad-end suddenylu becoming victory scene, Second Wind not increasing also max Reg % cap for it duration, not adding dmg bonus to arrow/bolt attacks ");
outputText("for using lightning or darkness arrows, eating in HXD restaurant / giving Sidone BJ / giving Konstantine BJ not refilling hunger\n\n\n\n\n\n\n");/*ostatni punkt changelogu
outputText("for using lightning or darkness arrows, eating in HXD restaurant / giving Sidone BJ / giving Konstantine BJ not refilling hunger, chitin gathering not progressing properly\n\n");/*ostatni punkt changelogu
outputText("<b>Version 0.8l2:</b>\n\n");
outputText("-New quest on Adventure Guild: gather green gel. First time completing reward is 1 perk point and all afterward completetions giving 3 spirit stones.\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-\n");
outputText("-Fixed bugs: \n\n\n\n\n\n");
//outputText("-New tier 11 strength lvl-up perk: Too Angry to Die. Req. Fuel for the Fire perk. Effect: . (+600 max Wrath)\n");
outputText("\n");cel na 0.8: dodać nekomanta TF
outputText("\n");cel na 0.8: dodać kitsune/salamander TF
Expand Down Expand Up @@ -189,6 +195,14 @@ package classes.Scenes
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");
outputText("\n");*/
outputText("\n\n\n");
outputText("Plans for future builds (I know some of them are HUGE ones but without dreams to chase how can one change?):\n");
Expand All @@ -206,7 +220,7 @@ package classes.Scenes
}
private function Changelog24():void {
clearOutput();
outputText("(Part 1/2) <b>Version 0.8l:</b>\n\n");
outputText("(Part 1/2) <b>Version 0.8l (New Lunar Year mini-event + pig/boar/elf TF's rework, orc + displacer beast TF, 2 new areas + new enemies, Job: Gunslinger perk line, Perk-o-calipse 4 (77 perks), Achiev-o-calipse (over 70 new achievs), The Unicorn Daughter Strikes Back (Yes Celess is Back)):</b>\n\n");
outputText("-Added in current version race effects to Metamorph perk: Pig, Boar\n");
outputText("-New tier 0 misc lvl-up perk: Pig/Boar Fat. Req. 100+ thickness and pig score 4+. Effect: +1 to pig score, double dmg added to Body Slam that is based on thickness, +1 to physical/magicical armor def value (scalable), +10 to max thickness and +5 to max tou (scalable).\n");
outputText("-New tier 0 misc lvl-up perk: Orc Adrenal Glands. Req. Ferocity perk and 4+ orc score and free slot for adrenal glands mutations. Effect: +1 to orc score, increasing Ferocity limit by 2%, 5 pts of phantom Str (scalable).\n");
Expand Down
58 changes: 55 additions & 3 deletions classes/classes/Scenes/Places/HeXinDao/JourneyToTheEast.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ package classes.Scenes.Places.HeXinDao
else {
addButtonDisabled(4, "Demons", "Only for Iron tier Adventurer.");
}
addButton(5, "Chitin", BoardkeeperYangQuestChitin).hint("Cooper tier Quest.");
//addButton(5, "Gel", BoardkeeperYangQuestGel).hint("Cooper tier Quest.");
addButton(6, "Chitin", BoardkeeperYangQuestChitin).hint("Cooper tier Quest.");
if (flags[kFLAGS.GALIA_LVL_UP] == 0.53 || (flags[kFLAGS.GALIA_LVL_UP] >= 0.5 && flags[kFLAGS.GALIA_TALKS] > 0)) addButtonDisabled(10, "Ferals (C)", "You already finished this quest.");
else if (player.statusEffectv2(StatusEffects.AdventureGuildQuests2) >= 2) {
if (flags[kFLAGS.GALIA_LVL_UP] >= 0.44 && flags[kFLAGS.GALIA_AFFECTION] == 10) addButton(10, "Ferals (C)", BoardkeeperYangQuestEzekiel1a);
Expand Down Expand Up @@ -461,6 +462,49 @@ package classes.Scenes.Places.HeXinDao
}
doNext(curry(enteringInn,false));
}
public function BoardkeeperYangQuestGel():void {
clearOutput();
if (player.statusEffectv2(StatusEffects.AdventureGuildQuests4) > 0) {
if (player.statusEffectv2(StatusEffects.AdventureGuildQuests4) > 4) {
outputText("The panda decline the job request.\n\n");
outputText("\"<i>Sorry [name] this job is only once per day. Come back tomorrow.</i>\"\n\n");
}
else if (player.statusEffectv2(StatusEffects.AdventureGuildQuests4) == 4) {
if (player.hasItem(useables.GREENGL, 5)) {
outputText("You turn in the quest and Yang nod in appreciation.\n\n");
outputText("\"<i>Good job there. I hope gathering these did not prove to much trouble. Here is your payment.</i>\"\n\n");
player.addStatusValue(StatusEffects.AdventureGuildQuests4, 2, 1);
player.destroyItems(useables.GREENGL, 5);
flags[kFLAGS.SPIRIT_STONES] += 3;
statScreenRefresh();
}
else outputText("You try to turn in the quest but Yang tells you you don’t have enough chitin yet.\n\n");
}
else if (player.statusEffectv2(StatusEffects.AdventureGuildQuests4) == 2) {
outputText("\"<i>You may or may not like that one. The good news is you are going out to gather chitin the bad news is it primarily drop from bee girls which is a friendly species so your morality may be put to the test. How you handle that is up to you, ");
outputText("for all I know chitin is often found on the forest ground where bee girls trives. Regardless bring us back 5 chitin and your job will be done.</i>\"\n\n");
player.addStatusValue(StatusEffects.AdventureGuildQuests4, 2, 2);
}
else {
if (player.hasItem(useables.GREENGL, 5)) {
outputText("You turn in the quest and Yang nod in appreciation.\n\n");
outputText("\"<i>My my, nice job. I can only hope you kept that weapon clean of innocent blood. Regardless here is your payment. This reminds me the client told me to leave you this scroll as a reward too you know what to do with it I suppose?</i>\"\n\n");
if (player.hasKeyItem("Adventurer Guild: Copper plate") >= 0) player.addKeyValue("Adventurer Guild: Copper plate", 1, 1);
player.addStatusValue(StatusEffects.AdventureGuildQuests4, 2, 1);
player.destroyItems(useables.GREENGL, 5);
player.perkPoints += 1;
}
else outputText("You try to turn in the quest but Yang tells you you don’t have enough gel yet.\n\n");
}
}
else {
outputText("\"<i>You may or may not like that one. The good news is you are going out to gather chitin the bad news is it primarily drop from bee girls which is a friendly species so your morality may be put to the test. How you handle that is up to you, ");
outputText("for all I know chitin is often found on the forest ground where bee girls trives. Regardless bring us back 5 chitin and your job will be done.</i>\"\n\n");
if (player.hasStatusEffect(StatusEffects.AdventureGuildQuests4)) player.addStatusValue(StatusEffects.AdventureGuildQuests4, 2, 1);
else player.createStatusEffect(StatusEffects.AdventureGuildQuests4, 0, 1, 0, 0);
}
doNext(curry(enteringInn,false));
}
public function BoardkeeperYangQuestChitin():void {
clearOutput();
if (player.statusEffectv1(StatusEffects.AdventureGuildQuests4) > 0) {
Expand All @@ -482,14 +526,22 @@ package classes.Scenes.Places.HeXinDao
else if (player.statusEffectv1(StatusEffects.AdventureGuildQuests4) == 2) {
outputText("\"<i>You may or may not like that one. The good news is you are going out to gather chitin the bad news is it primarily drop from bee girls which is a friendly species so your morality may be put to the test. How you handle that is up to you, ");
outputText("for all I know chitin is often found on the forest ground where bee girls trives. Regardless bring us back 5 chitin and your job will be done.</i>\"\n\n");
player.addStatusValue(StatusEffects.AdventureGuildQuests4, 3, 2);
player.addStatusValue(StatusEffects.AdventureGuildQuests4, 1, 2);
if (player.statusEffectv3(StatusEffects.AdventureGuildQuests4) > 0) {
player.removeStatusEffect(StatusEffects.AdventureGuildQuests4);
player.createStatusEffect(StatusEffects.AdventureGuildQuests4, 4, 0, 0, 0);
}
}
else {
if (player.hasItem(useables.B_CHITN, 5)) {
outputText("You turn in the quest and Yang nod in appreciation.\n\n");
outputText("\"<i>My my, nice job. I can only hope you kept that weapon clean of innocent blood. Regardless here is your payment. This reminds me the client told me to leave you this scroll as a reward too you know what to do with it I suppose?</i>\"\n\n");
if (player.hasKeyItem("Adventurer Guild: Copper plate") >= 0) player.addKeyValue("Adventurer Guild: Copper plate", 1, 1);
player.addStatusValue(StatusEffects.AdventureGuildQuests4, 3, 1);
player.addStatusValue(StatusEffects.AdventureGuildQuests4, 1, 1);
if (player.statusEffectv3(StatusEffects.AdventureGuildQuests4) > 0) {
player.removeStatusEffect(StatusEffects.AdventureGuildQuests4);
player.createStatusEffect(StatusEffects.AdventureGuildQuests4, 2, 0, 0, 0);
}
player.destroyItems(useables.B_CHITN, 5);
player.perkPoints += 1;
}
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/Scenes/Questlog.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ public class Questlog extends BaseContent
if (flags[kFLAGS.DEN_OF_DESIRE_QUEST] == 2) outputText("Completed (Reward taken)");
else if (SceneLib.dungeons.checkDenOfDesireClear()) outputText("Completed");
else if (flags[kFLAGS.DEN_OF_DESIRE_BOSSES] > 1) outputText("In Progress");
else outputText("Not Started");
else outputText("Not Started");/*
outputText("\n\n<u><b>River Dungeon Exploration</b></u>");
outputText("\n<b>1st Floor:</b> ");
if (SceneLib.dungeons.checkRiverDungeon1stFloorClear()) outputText("Completed");
else outputText("Not Started/In Progress");
outputText("\n<i><b>2nd Floor:</b> Soon</i>");
outputText("\n<i><b>2nd Floor:</b> Soon</i>");*/
outputText("\n\n<u><b>Adventure Guild Quests</b></u>");
outputText("\n<b>Imps Hunt:</b> ");
if (player.statusEffectv1(StatusEffects.AdventureGuildQuests1) == 2 || player.statusEffectv1(StatusEffects.AdventureGuildQuests1) == 4 || player.statusEffectv1(StatusEffects.AdventureGuildQuests1) == 7) outputText("Completed (for today)");
Expand Down
2 changes: 1 addition & 1 deletion classes/classes/StatusEffects.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import classes.StatusEffects.VampireThirstEffect;
public static const AdventureGuildQuests1:StatusEffectType = mk("Adventure Guild Quests 1");//Imps Hunt / Demons Hunt / Minotaurs Hunt / x
public static const AdventureGuildQuests2:StatusEffectType = mk("Adventure Guild Quests 2");//Feral Tentacle Beasts Hunt / Feral Imps Hunt / x / x
public static const AdventureGuildQuests3:StatusEffectType = mk("Adventure Guild Quests 3");//x / x / x / x
public static const AdventureGuildQuests4:StatusEffectType = mk("Adventure Guild Quests 4");//Chitin gathering / x / x / x
public static const AdventureGuildQuests4:StatusEffectType = mk("Adventure Guild Quests 4");//Chitin gathering / Gel gathering / x / x
public static const AllNaturalOnaholeUsed:StatusEffectType = mk("all-natural onahole used");
public static const AlrauneFlower:StatusEffectType = mk("Alraune Flower");
public static const AndysSmoke:StatusEffectType = mk("Andy's Smoke"); //v1: Hours; v2: Speed; v3: Intelligence
Expand Down

0 comments on commit c9b753d

Please sign in to comment.