Skip to content

Commit

Permalink
Merge pull request Kitteh6660#460 from Jtecx/master-wip
Browse files Browse the repository at this point in the history
Moar mutations changes
  • Loading branch information
Ormael7 authored Aug 26, 2021
2 parents ca7de57 + 52367c3 commit d1a6495
Show file tree
Hide file tree
Showing 7 changed files with 146 additions and 239 deletions.
10 changes: 10 additions & 0 deletions classes/classes/BaseContent.as
Original file line number Diff line number Diff line change
Expand Up @@ -986,6 +986,16 @@ import coc.xxc.StoryContext;
}
if (back != null) button(14).show("Back",back);
}
//Returns an autocreated menu. Takes an array in buttonName + function. i.e., array.push("buttonname", function).
protected function menuGen(menuItems:Array, page:int, back:Function=null, sort:Boolean=false):void {
var selectMenu:ButtonDataList = new ButtonDataList();
for (var i:int = 0; i < menuItems.length; i++){
if (i % 2 == 0){
selectMenu.add(menuItems[i], curry(menuItems[i + 1]));
}
}
submenu(selectMenu, back, page, sort);
}
}

}
3 changes: 2 additions & 1 deletion classes/classes/CharCreation.as
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,7 @@ import coc.view.MainView;
player.HP = player.maxHP();
Metamorph.resetMetamorph();
//doYesNo(goToIngnam, arrival);
menu();
addButton(0, "Ingnam", goToIngnam);
addButton(1,"Skip Ingnam", arrival);
}
Expand Down Expand Up @@ -3047,4 +3048,4 @@ import coc.view.MainView;
return (statusEffect == StatusEffects.KnowsWereBeast || statusEffects.value4 == 9000); //na razie jest tu tylko werebeast
} //ale potem zamienić to na specialne soulskills z każdego z klanów
} // what the fuck are those weird comments here? ^
}
}
8 changes: 4 additions & 4 deletions classes/classes/MutationsLib.as
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ public class MutationsLib
return new PerkType(id, name, desc, longDesc, keepOnAscension);
}

//Idea: One function that returns array of each mutation. Each push is a different mutation bodypart. Set merge to true for all requested to return in one array, else returns as an array of arrays.
//Returns an array of arrays of mutation body parts. Can be specified to specific parts with teh first argument.
//Must update here with an extra push to all mutations points. This feeds the Perks/Mutations DB and Evangeline's Mutations information.
public static function mutationsArray(spec:String = "", merge:Boolean = false):Array {
var MutationsList:Array = []
Expand Down Expand Up @@ -421,14 +421,14 @@ public class MutationsLib
function mutationsLungs():void{
MutationsList.push([ArachnidBookLung, ArachnidBookLungEvolved, ArachnidBookLungFinalForm]);
MutationsList.push([DraconicLungs, DraconicLungsEvolved, DraconicLungsFinalForm]);
MutationsList.push([CaveWyrmLungs, CaveWyrmLungsEvolved, CaveWyrmLungsFinalForm]);
//MutationsList.push([CaveWyrmLungs, CaveWyrmLungsEvolved, CaveWyrmLungsFinalForm]);
MutationsList.push([MelkieLung, MelkieLungEvolved, MelkieLungFinalForm]);
MutationsList.push([DrakeLungs, DrakeLungsEvolved, DrakeLungsFinalForm]);
}
function mutationsMetabolism():void{
MutationsList.push([ManticoreMetabolism, ManticoreMetabolismEvolved]);
MutationsList.push([DisplacerMetabolism, DisplacerMetabolismEvolved]);
MutationsList.push([SlimeMetabolism, SlimeMetabolismEvolved]);
//MutationsList.push([SlimeMetabolism, SlimeMetabolismEvolved]);
}
function mutationsOvaries():void{
MutationsList.push([LactaBovinaOvaries, LactaBovinaOvariesEvolved, LactaBovinaOvariesFinalForm]);
Expand All @@ -440,7 +440,7 @@ public class MutationsLib
MutationsList.push([NukiNuts, NukiNutsEvolved, NukiNutsFinalForm]);
}
function mutationsEyes():void{
MutationsList.push([GazerEye, GazerEyeEvolved, GazerEyeFinalForm]);
//MutationsList.push([GazerEye, GazerEyeEvolved, GazerEyeFinalForm]);
MutationsList.push([GorgonsEyes, GorgonsEyesEvolved]);
}
function mutationsNervSys():void{
Expand Down
Loading

0 comments on commit d1a6495

Please sign in to comment.