Skip to content

Commit

Permalink
Mod update 1.3.7
Browse files Browse the repository at this point in the history 
More refactors and bug fixes.

Christmas achievements are now earnable.
  • Loading branch information
@Kitteh6660
Kitteh6660 committed Jan 2, 2016
1 parent 29243f9 commit c0dfc99
Show file tree
Hide file tree
Showing 24 changed files with 292 additions and 406 deletions.
22 changes: 18 additions & 4 deletions classes/classes/Appearance.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2237,8 +2237,6 @@
return descript;
}
*/



public static const BREAST_CUP_NAMES:Array = [
"flat",//0
Expand All @@ -2252,7 +2250,19 @@
"QQ-cup", "large QQ-cup", "R-cup", "large R-cup", "RR-cup", "large RR-cup", "S-cup", "large S-cup", "SS-cup", "large SS-cup",//60-69
"T-cup", "large T-cup", "TT-cup", "large TT-cup", "U-cup", "large U-cup", "UU-cup", "large UU-cup", "V-cup", "large V-cup",//70-79
"VV-cup", "large VV-cup", "W-cup", "large W-cup", "WW-cup", "large WW-cup", "X-cup", "large X-cup", "XX-cup", "large XX-cup",//80-89
"Y-cup", "large Y-cup", "YY-cup", "large YY-cup", "Z-cup", "large Z-cup", "ZZ-cup", "large ZZ-cup", "ZZZ-cup", "large ZZZ-cup"//90-99
"Y-cup", "large Y-cup", "YY-cup", "large YY-cup", "Z-cup", "large Z-cup", "ZZ-cup", "large ZZ-cup", "ZZZ-cup", "large ZZZ-cup",//90-99
//HYPER ZONE
"hyper A-cup", "hyper B-cup", "hyper C-cup", "hyper D-cup", "hyper DD-cup", "hyper big DD-cup", "hyper E-cup", "hyper big E-cup", "hyper EE-cup",//100-109
"hyper big EE-cup", "hyper F-cup", "hyper big F-cup", "hyper FF-cup", "hyper big FF-cup", "hyper G-cup", "hyper big G-cup", "hyper GG-cup", "hyper big GG-cup", "hyper H-cup",//110-119
"hyper big H-cup", "hyper HH-cup", "hyper big HH-cup", "hyper HHH-cup", "hyper I-cup", "hyper big I-cup", "hyper II-cup", "hyper big II-cup", "hyper J-cup", "hyper big J-cup",//120-129
"hyper JJ-cup", "hyper big JJ-cup", "hyper K-cup", "hyper big K-cup", "hyper KK-cup", "hyper big KK-cup", "hyper L-cup", "hyper big L-cup", "hyper LL-cup", "hyper big LL-cup",//130-139
"hyper M-cup", "hyper big M-cup", "hyper MM-cup", "hyper big MM-cup", "hyper MMM-cup", "hyper large MMM-cup", "hyper N-cup", "hyper large N-cup", "hyper NN-cup", "hyper large NN-cup",//140-149
"hyper O-cup", "hyper large O-cup", "hyper OO-cup", "hyper large OO-cup", "hyper P-cup", "hyper large P-cup", "hyper PP-cup", "hyper large PP-cup", "hyper Q-cup", "hyper large Q-cup",//150-159
"hyper QQ-cup", "hyper large QQ-cup", "hyper R-cup", "hyper large R-cup", "hyper RR-cup", "hyper large RR-cup", "hyper S-cup", "hyper large S-cup", "hyper SS-cup", "hyper large SS-cup",//160-169
"hyper T-cup", "hyper large T-cup", "hyper TT-cup", "hyper large TT-cup", "hyper U-cup", "hyper large U-cup", "hyper UU-cup", "hyper large UU-cup", "hyper V-cup", "hyper large V-cup",//170-179
"hyper VV-cup", "hyper large VV-cup", "hyper W-cup", "hyper large W-cup", "hyper WW-cup", "hyper large WW-cup", "hyper X-cup", "hyper large X-cup", "hyper XX-cup", "hyper large XX-cup",//180-189
"hyper Y-cup", "hyper large Y-cup", "hyper YY-cup", "hyper large YY-cup", "hyper Z-cup", "hyper large Z-cup", "hyper ZZ-cup", "hyper large ZZ-cup", "hyper ZZZ-cup", "hyper large ZZZ-cup",//190-199
"jacques00-cup"
];

public static function breastCup(size:Number):String
Expand Down Expand Up @@ -2806,9 +2816,13 @@
descript += randomChoice("massive motherly ", "luscious ", "smothering ", "prodigious ");
}
//K- > MMM+
else {
else if (val < 100) {
descript += randomChoice("mountainous ", "monumental ", "back-breaking ", "exercise-ball-sized ", "immense ");
}
//Hyper sizes
else {
descript += randomChoice("ludicrously-sized ", "hideously large ", "absurdly large ", "back-breaking ", "colossal ", "immense ");
}
return descript;
}

Expand Down
13 changes: 8 additions & 5 deletions classes/classes/BaseContent.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,8 @@
{
kGAMECLASS.hideMenus();
}

//To be phased out
protected function choices(text1:String, butt1:Function,
text2:String, butt2:Function,
text3:String, butt3:Function,
Expand All @@ -303,6 +305,7 @@
);
}

//To be phased out
protected function simpleChoices(text1:String, butt1:Function,
text2:String, butt2:Function,
text3:String, butt3:Function,
Expand All @@ -324,6 +327,11 @@
kGAMECLASS.addButton(pos, text, func1, arg1, arg2, arg3, toolTipText, toolTipHeader);
}

protected function addButtonDisabled(pos:int, text:String = "", toolTipText:String = "", toolTipHeader:String = ""):void
{
kGAMECLASS.addButtonDisabled(pos, text, toolTipText, toolTipHeader);
}

protected function removeButton(arg:*):void
{
kGAMECLASS.removeButton(arg);
Expand All @@ -334,11 +342,6 @@
return kGAMECLASS.hasButton(arg);
}

protected function addLockedButton(pos:int, toolTipText:String = ""):void
{
kGAMECLASS.addLockedButton(pos, toolTipText);
}

/* Replaced by Utils.formatStringArray, which does almost the same thing in one function
protected function clearList():void{
kGAMECLASS.clearList();
Expand Down
4 changes: 2 additions & 2 deletions classes/classes/CoC.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,8 @@ the text from being too boring.
//model.debug = debug; // TODO: Set on model?

//Version NUMBER
ver = "0.9.4_mod_1.3.6b";
version = ver + " (<b>Custom Characters, Perks, Refactors Ahoy!</b>)";
ver = "0.9.4_mod_1.3.7";
version = ver + " (<b>More code cleaning, Taur overhaul.</b>)";

//Indicates if building for mobile?
mobile = false;
Expand Down
222 changes: 0 additions & 222 deletions classes/classes/Creature.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2965,228 +2965,6 @@ package classes
public function breastCup(rowNum:Number):String
{
return Appearance.breastCup(breastRows[rowNum].breastRating);
//Should change this to make use of Appearance return BreastStore.cupSize(breastRows[rowNum].breastRating);
/*
if (breastRows[rowNum].breastRating < 1)
return "flat, manly breast";
else if (breastRows[rowNum].breastRating < 2)
return "A-cup";
else if (breastRows[rowNum].breastRating < 3)
return "B-cup";
else if (breastRows[rowNum].breastRating < 4)
return "C-cup";
else if (breastRows[rowNum].breastRating < 5)
return "D-cup";
else if (breastRows[rowNum].breastRating < 6)
return "DD-cup";
else if (breastRows[rowNum].breastRating < 7)
return "big DD-cup";
else if (breastRows[rowNum].breastRating < 8)
return "E-cup";
else if (breastRows[rowNum].breastRating < 9)
return "big E-cup";
else if (breastRows[rowNum].breastRating < 10)
return "EE-cup";
else if (breastRows[rowNum].breastRating < 11)
return "big EE-cup";
else if (breastRows[rowNum].breastRating < 12)
return "F-cup";
else if (breastRows[rowNum].breastRating < 13)
return "big F-cup";
else if (breastRows[rowNum].breastRating < 14)
return "FF-cup";
else if (breastRows[rowNum].breastRating < 15)
return "big FF-cup";
else if (breastRows[rowNum].breastRating < 16)
return "G-cup";
else if (breastRows[rowNum].breastRating < 17)
return "big G-cup";
else if (breastRows[rowNum].breastRating < 18)
return "GG-cup";
else if (breastRows[rowNum].breastRating < 19)
return "big GG-cup";
else if (breastRows[rowNum].breastRating < 20)
return "H-cup";
else if (breastRows[rowNum].breastRating < 21)
return "big H-cup";
else if (breastRows[rowNum].breastRating < 22)
return "HH-cup";
else if (breastRows[rowNum].breastRating < 23)
return "big HH-cup";
else if (breastRows[rowNum].breastRating < 24)
return "HHH-cup";
else if (breastRows[rowNum].breastRating < 25)
return "I-cup";
else if (breastRows[rowNum].breastRating < 26)
return "big I-cup";
else if (breastRows[rowNum].breastRating < 27)
return "II-cup";
else if (breastRows[rowNum].breastRating < 28)
return "big II-cup";
else if (breastRows[rowNum].breastRating < 29)
return "J-cup";
else if (breastRows[rowNum].breastRating < 30)
return "big J-cup";
else if (breastRows[rowNum].breastRating < 31)
return "JJ-cup";
else if (breastRows[rowNum].breastRating < 32)
return "big JJ-cup";
else if (breastRows[rowNum].breastRating < 33)
return "K-cup";
else if (breastRows[rowNum].breastRating < 34)
return "big K-cup";
else if (breastRows[rowNum].breastRating < 35)
return "KK-cup";
else if (breastRows[rowNum].breastRating < 36)
return "big KK-cup";
else if (breastRows[rowNum].breastRating < 37)
return "L-cup";
else if (breastRows[rowNum].breastRating < 38)
return "big L-cup";
else if (breastRows[rowNum].breastRating < 39)
return "LL-cup";
else if (breastRows[rowNum].breastRating < 40)
return "big LL-cup";
else if (breastRows[rowNum].breastRating < 41)
return "M-cup";
else if (breastRows[rowNum].breastRating < 42)
return "big M-cup";
else if (breastRows[rowNum].breastRating < 43)
return "MM-cup";
else if (breastRows[rowNum].breastRating < 44)
return "big MM-cup";
else if (breastRows[rowNum].breastRating < 45)
return "MMM-cup";
else if (breastRows[rowNum].breastRating < 46)
return "large MMM-cup";
else if (breastRows[rowNum].breastRating < 47)
return "N-cup";
else if (breastRows[rowNum].breastRating < 48)
return "large N-cup";
else if (breastRows[rowNum].breastRating < 49)
return "NN-cup";
else if (breastRows[rowNum].breastRating < 50)
return "large NN-cup";
else if (breastRows[rowNum].breastRating < 51)
return "O-cup";
else if (breastRows[rowNum].breastRating < 52)
return "large O-cup";
else if (breastRows[rowNum].breastRating < 53)
return "OO-cup";
else if (breastRows[rowNum].breastRating < 54)
return "large OO-cup";
else if (breastRows[rowNum].breastRating < 55)
return "P-cup";
else if (breastRows[rowNum].breastRating < 56)
return "large P-cup";
else if (breastRows[rowNum].breastRating < 57)
return "PP-cup";
else if (breastRows[rowNum].breastRating < 58)
return "large PP-cup";
else if (breastRows[rowNum].breastRating < 59)
return "Q-cup";
else if (breastRows[rowNum].breastRating < 60)
return "large Q-cup";
else if (breastRows[rowNum].breastRating < 61)
return "QQ-cup";
else if (breastRows[rowNum].breastRating < 62)
return "large QQ-cup";
else if (breastRows[rowNum].breastRating < 63)
return "R-cup";
else if (breastRows[rowNum].breastRating < 64)
return "large R-cup";
else if (breastRows[rowNum].breastRating < 65)
return "RR-cup";
else if (breastRows[rowNum].breastRating < 66)
return "large RR-cup";
else if (breastRows[rowNum].breastRating < 67)
return "S-cup";
else if (breastRows[rowNum].breastRating < 68)
return "large S-cup";
else if (breastRows[rowNum].breastRating < 69)
return "SS-cup";
else if (breastRows[rowNum].breastRating < 70)
return "large SS-cup";
else if (breastRows[rowNum].breastRating < 71)
return "T-cup";
else if (breastRows[rowNum].breastRating < 72)
return "large T-cup";
else if (breastRows[rowNum].breastRating < 73)
return "TT-cup";
else if (breastRows[rowNum].breastRating < 74)
return "large TT-cup";
else if (breastRows[rowNum].breastRating < 75)
return "U-cup";
else if (breastRows[rowNum].breastRating < 76)
return "large U-cup";
else if (breastRows[rowNum].breastRating < 77)
return "UU-cup";
else if (breastRows[rowNum].breastRating < 78)
return "large UU-cup";
else if (breastRows[rowNum].breastRating < 79)
return "V-cup";
else if (breastRows[rowNum].breastRating < 80)
return "large V-cup";
else if (breastRows[rowNum].breastRating < 81)
return "VV-cup";
else if (breastRows[rowNum].breastRating < 82)
return "large VV-cup";
else if (breastRows[rowNum].breastRating < 83)
return "W-cup";
else if (breastRows[rowNum].breastRating < 84)
return "large W-cup";
else if (breastRows[rowNum].breastRating < 85)
return "WW-cup";
else if (breastRows[rowNum].breastRating < 86)
return "large WW-cup";
else if (breastRows[rowNum].breastRating < 87)
return "X-cup";
else if (breastRows[rowNum].breastRating < 88)
return "large X-cup";
else if (breastRows[rowNum].breastRating < 89)
return "XX-cup";
else if (breastRows[rowNum].breastRating < 90)
return "large XX-cup";
else if (breastRows[rowNum].breastRating < 91)
return "Y-cup";
else if (breastRows[rowNum].breastRating < 92)
return "large Y-cup";
else if (breastRows[rowNum].breastRating < 93)
return "YY-cup";
else if (breastRows[rowNum].breastRating < 94)
return "large YY-cup";
else if (breastRows[rowNum].breastRating < 95)
return "Z-cup";
else if (breastRows[rowNum].breastRating < 96)
return "large Z-cup";
else if (breastRows[rowNum].breastRating < 97)
return "ZZ-cup";
else if (breastRows[rowNum].breastRating < 98)
return "large ZZ-cup";
else if (breastRows[rowNum].breastRating < 99)
return "ZZZ-cup";
else if (breastRows[rowNum].breastRating < 100)
return "large ZZZ-cup";
// else if(breastRows[rowNum].breastRating < 20) return "watermelon-sized cup";
// else if(breastRows[rowNum].breastRating < 35) return "tent-sized cup";
// else if(breastRows[rowNum].breastRating < 60) return "truck-sized cup";
// else if(breastRows[rowNum].breastRating < 100) return "parachute-sized cup";
else
return "game-breaking cup";
return "Error-Cup (breastSize Error Number: " + breastRows[rowNum].breastRating;
//watermelon-sized
//tent sized
//truck sized
//parachute sized
//pool-sized
//hanger-sized
//town-sized
//city-sized
//state-sized
//continent-sized
//planet-sized
//WTFISTHISWHYISNTITGAMEOVER?
*/
}

public function bRows():Number
Expand Down
3 changes: 1 addition & 2 deletions classes/classes/Items/Weapons/EldritchStaff.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
package classes.Items.Weapons
{
import classes.Items.Weapon;
import classes.Items.WeaponLib;
import classes.PerkLib;
import classes.Player;

public class EldritchStaff extends WeaponWithPerk {

public function EldritchStaff() {
super("E.Staff", "E.Staff", "eldritch staff", "an eldritch staff", "thwack", 10, WeaponLib.DEFAULT_VALUE, "This eldritch staff once belonged to the Harpy Queen, who was killed after her defeat at your hands. It fairly sizzles with magical power.", "Wizard's Focus", PerkLib.WizardsFocus, 0.6, 0, 0, 0);
super("E.Staff", "E.Staff", "eldritch staff", "an eldritch staff", "thwack", 10, 1000, "This eldritch staff once belonged to the Harpy Queen, who was killed after her defeat at your hands. It fairly sizzles with magical power.", "Wizard's Focus", PerkLib.WizardsFocus, 0.6, 0, 0, 0);
}

override public function get verb():String {
Expand Down
3 changes: 1 addition & 2 deletions classes/classes/Items/Weapons/WizardsStaff.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ package classes.Items.Weapons
super("W.Staff", "W. Staff", "wizard's staff", "a wizard's staff", "smack", 3, 350, "This staff is made of very old wood and seems to tingle to the touch. The top has an odd zig-zag shape to it, and the wood is worn smooth from lots of use. It probably belonged to a wizard at some point and would aid magic use.", "Wizard's Focus", PerkLib.WizardsFocus, 0.4, 0, 0, 0);
}


override public function get verb():String {
return game.player.findPerk(PerkLib.StaffChanneling) >= 0 ? "shot" : "smack";
}
}
}
}
4 changes: 0 additions & 4 deletions classes/classes/Scenes/Achievements.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,6 @@ package classes.Scenes
addButton(14, "Back", kGAMECLASS.mainMenu);
}

public function achievementsStoryline():void {

}

}

}
Loading

0 comments on commit c0dfc99

Please sign in to comment.