Skip to content

Commit

Permalink
Merge pull request Kitteh6660#22 from Ormael7/master-wip
Browse files Browse the repository at this point in the history 
Master wip
  • Loading branch information
@Jtecx
Jtecx authored Jan 5, 2021
2 parents 380a58b + 0f53d03 commit 4f08ef2
Show file tree
Hide file tree
Showing 25 changed files with 2,506 additions and 2,639 deletions.
473 changes: 12 additions & 461 deletions classes/classes/Appearance.as
View file

Large diffs are not rendered by default.

19 changes: 17 additions & 2 deletions classes/classes/BodyParts/Antennae.as
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
package classes.BodyParts {
import classes.internals.EnumValue;

public class Antennae extends BodyPart {
/**
* Entry properties:
* - value: numerical id (0, 1)
* - id: name of the constant ("NONE", "MANTIS")
* - name: human-readable name, ("non-existant", "mantis")
*/
public static var Types:/*EnumValue*/Array = [];

public static const NONE:int = 0;
EnumValue.add(Types, NONE, "NONE", {name: "non-existant"});
public static const MANTIS:int = 1;
EnumValue.add(Types, MANTIS, "MANTIS", {name: "mantis"});
public static const BEE:int = 2;
EnumValue.add(Types, BEE, "BEE", {name: "bee"});
public static const COCKATRICE:int = 3;
EnumValue.add(Types, COCKATRICE, "COCKATRICE", {name: "cockatrice"});
public static const FIRE_SNAIL:int = 4;
EnumValue.add(Types, FIRE_SNAIL, "FIRE_SNAIL", {name: "fire snail"});
public static const MOTH:int = 5;
EnumValue.add(Types, MOTH, "MOTH", {name: "moth"});
public static const CENTIPEDE:int = 6;
// Don't forget to add new types in DebugMenu.as list ANTENNA_TYPE_CONSTANTS
EnumValue.add(Types, CENTIPEDE, "CENTIPEDE", {name: "centipede"});

public function Antennae() {
super(null, null);
}
}
}
}
66 changes: 64 additions & 2 deletions classes/classes/BodyParts/Arms.as
View file
Original file line number Diff line number Diff line change
@@ -1,64 +1,126 @@
package classes.BodyParts {
import classes.internals.EnumValue;

public class Arms extends BodyPart {
/**
* Entry properties:
* - value: numerical id (0, 1)
* - id: name of the constant ("HUMAN", "HARPY")
* - name: human-readable default name, ("human", "harpy")
*/
public static var Types:/*EnumValue*/Array = [];

public static const HUMAN:int = 0;
EnumValue.add(Types, HUMAN, "HUMAN", {name:"human"});
public static const HARPY:int = 1;
EnumValue.add(Types, HARPY, "HARPY", {name:"harpy"});
public static const SPIDER:int = 2;
EnumValue.add(Types, SPIDER, "SPIDER", {name:"spider"});
public static const MANTIS:int = 3;
EnumValue.add(Types, MANTIS, "MANTIS", {name:"mantis"});
public static const BEE:int = 4;
EnumValue.add(Types, BEE, "BEE", {name:"bee"});
public static const SALAMANDER:int = 5;
EnumValue.add(Types, SALAMANDER, "SALAMANDER", {name:"salamander"});
public static const PHOENIX:int = 6;
EnumValue.add(Types, PHOENIX, "PHOENIX", {name:"phoenix"});
public static const PLANT:int = 7;
EnumValue.add(Types, PLANT, "PLANT", {name:"plant"});
public static const SHARK:int = 8;
EnumValue.add(Types, SHARK, "SHARK", {name:"shark"});
public static const GARGOYLE:int = 9;
EnumValue.add(Types, GARGOYLE, "GARGOYLE", {name:"gargoyle"});
public static const WOLF:int = 10;
EnumValue.add(Types, WOLF, "WOLF", {name:"wolf"});
public static const LION:int = 11;
EnumValue.add(Types, LION, "LION", {name:"lion"});
public static const KITSUNE:int = 12;
EnumValue.add(Types, KITSUNE, "KITSUNE", {name:"kitsune"});
public static const FOX:int = 13;
EnumValue.add(Types, FOX, "FOX", {name:"fox"});
public static const LIZARD:int = 14;//button 0 on 2nd page of metamorph
EnumValue.add(Types, LIZARD, "LIZARD", {name:"lizard"});
public static const DRAGON:int = 15;
EnumValue.add(Types, DRAGON, "DRAGON", {name:"dragon"});
public static const YETI:int = 16;
EnumValue.add(Types, YETI, "YETI", {name:"yeti"});
public static const ORCA:int = 17;
EnumValue.add(Types, ORCA, "ORCA", {name:"orca"});
public static const PLANT2:int = 18;
EnumValue.add(Types, PLANT2, "PLANT2", {name:"tentacle-covered"});
public static const DEVIL:int = 19;
EnumValue.add(Types, DEVIL, "DEVIL", {name:"devil"});
public static const ONI:int = 20;
EnumValue.add(Types, ONI, "ONI", {name:"oni"});
public static const ELF:int = 21;
EnumValue.add(Types, ELF, "ELF", {name:"elf"});
public static const RAIJU:int = 22;
EnumValue.add(Types, RAIJU, "RAIJU", {name:"raiju"});
public static const RED_PANDA:int = 23;
EnumValue.add(Types, RED_PANDA, "RED_PANDA", {name:"red-panda"});
public static const GARGOYLE_2:int = 24;
EnumValue.add(Types, GARGOYLE_2, "GARGOYLE_2", {name:"gargoyle"});
public static const CAT:int = 25;
EnumValue.add(Types, CAT, "CAT", {name:"cat"});
public static const AVIAN:int = 26;
EnumValue.add(Types, AVIAN, "AVIAN", {name:"avian"});
public static const GRYPHON:int = 27;
EnumValue.add(Types, GRYPHON, "GRYPHON", {name:"gryphon"});
public static const SPHINX:int = 28;//button 0 on 3rd page of metamorph
EnumValue.add(Types, SPHINX, "SPHINX", {name:"sphinx"});
public static const PIG:int = 29;
EnumValue.add(Types, PIG, "PIG", {name:"pig"});
public static const BOAR:int = 30;
EnumValue.add(Types, BOAR, "BOAR", {name:"boar"});
public static const ORC:int = 31;
EnumValue.add(Types, ORC, "ORC", {name:"orc"});
public static const DISPLACER:int = 32;
EnumValue.add(Types, DISPLACER, "DISPLACER", {name:"displacer"});
public static const CAVE_WYRM:int = 33;
EnumValue.add(Types, CAVE_WYRM, "CAVE_WYRM", {name:"cave wyrm"});
public static const HINEZUMI:int = 34;
EnumValue.add(Types, HINEZUMI, "HINEZUMI", {name:"hinezumi"});
public static const BEAR:int = 35;
EnumValue.add(Types, BEAR, "BEAR", {name:"bear"});
public static const GOO:int = 36;
EnumValue.add(Types, GOO, "GOO", {name:"goo"});
public static const HYDRA:int = 37;
EnumValue.add(Types, HYDRA, "HYDRA", {name:"hydra"});
public static const GHOST:int = 38;
EnumValue.add(Types, GHOST, "GHOST", {name:"ghost"});
public static const JIANGSHI:int = 39;
EnumValue.add(Types, JIANGSHI, "JIANGSHI", {name:"jiangshi"});
public static const RAIJU_2:int = 40;
EnumValue.add(Types, RAIJU_2, "RAIJU_2", {name:"raiju paws"});
public static const YUKI_ONNA:int = 41;
EnumValue.add(Types, YUKI_ONNA, "YUKI_ONNA", {name:"yuki onna"});
public static const MELKIE:int = 42;//button 0 on 4th page of metamorph
EnumValue.add(Types, MELKIE, "MELKIE", {name:"melkie"});
public static const CENTIPEDE:int = 43;
EnumValue.add(Types, CENTIPEDE, "CENTIPEDE", {name:"centipede"});
public static const KRAKEN:int = 44;
EnumValue.add(Types, KRAKEN, "KRAKEN", {name:"kraken"});
public static const FROSTWYRM:int = 45;
EnumValue.add(Types, FROSTWYRM, "FROSTWYRM", {name:"frostwyrm"});
public static const CANCER:int = 46;
EnumValue.add(Types, CANCER, "CANCER", {name:"cancer"});
public static const USHI_ONI_ONNA:int = 47;
EnumValue.add(Types, USHI_ONI_ONNA, "USHI_ONI_ONNA", {name:"ushi-oni"});
public static const KAMAITACHI:int = 48;
EnumValue.add(Types, KAMAITACHI, "KAMAITACHI", {name:"kamaitachi"});
public static const GAZER:int = 49;
EnumValue.add(Types, GAZER, "GAZER", {name:"gazer"});
public static const RACCOON:int = 50;
EnumValue.add(Types, RACCOON, "RACCOON", {name:"raccoon"});
public static const WEASEL:int = 51;
EnumValue.add(Types, WEASEL, "WEASEL", {name:"weasel"});
public static const SQUIRREL:int = 52;
EnumValue.add(Types, SQUIRREL, "SQUIRREL", {name:"squirrel"});
public static const WENDIGO:int = 53;
// Don't forget to add new types in DebugMenu.as list ARM_TYPE_CONSTANTS
EnumValue.add(Types, WENDIGO, "WENDIGO", {name:"wendigo"});

public function Arms() {
super(null, null);
}
}
}
}
16 changes: 14 additions & 2 deletions classes/classes/BodyParts/Beard.as
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,27 @@
package classes.BodyParts {
import classes.internals.EnumValue;

public class Beard extends BodyPart {
/**
* Entry properties:
* - value: numerical id (0, 1)
* - id: name of the constant ("NORMAL", "GOATEE")
* - name: human-readable default name, ("normal", "goatee")
*/
public static var Types:/*EnumValue*/Array = [];

public static const NORMAL:int = 0;
EnumValue.add(Types, NORMAL, "NORMAL", {name:"normal"});
public static const GOATEE:int = 1;
EnumValue.add(Types, GOATEE, "GOATEE", {name:"goatee"});
public static const CLEANCUT:int = 2;
EnumValue.add(Types, CLEANCUT, "CLEANCUT", {name:"clean-cut"});
public static const MOUNTAINMAN:int = 3;
// Don't forget to add new types in DebugMenu.as list BEARD_STYLE_CONSTANTS
EnumValue.add(Types, MOUNTAINMAN, "MOUNTAINMAN", {name:"mountain-man"});

public var length:Number = 0;
public function Beard() {
super(null, null);
}
}
}
}
25 changes: 22 additions & 3 deletions classes/classes/BodyParts/Claws.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,41 @@
*/
package classes.BodyParts {
import classes.Creature;
import classes.internals.EnumValue;

public class Claws extends SaveableBodyPart {
public var tone:String = "";
/**
* Entry properties:
* - value: numerical id (0, 1)
* - id: name of the constant ("NORMAL", "LIZARD")
* - name: human-readable default name, ("normal", "lizard")
*/
public static var Types:/*EnumValue*/Array = [];

public static const NORMAL:int = 0;
EnumValue.add(Types, NORMAL, "NORMAL", {name:"normal"});
public static const LIZARD:int = 1;
EnumValue.add(Types, LIZARD, "LIZARD", {name:"lizard"});
public static const DRAGON:int = 2;
EnumValue.add(Types, DRAGON, "DRAGON", {name:"dragon"});
public static const SALAMANDER:int = 3;
EnumValue.add(Types, SALAMANDER, "SALAMANDER", {name:"salamander"});
public static const CAT:int = 4; // NYI! Placeholder for now!!
EnumValue.add(Types, CAT, "CAT", {name:"cat"});
public static const DOG:int = 5; // NYI! Placeholder for now!!
EnumValue.add(Types, DOG, "DOG", {name:"dog"});
public static const RAPTOR:int = 6; // NYI! Placeholder for now!!
EnumValue.add(Types, RAPTOR, "RAPTOR", {name:"raptor"});
public static const MANTIS:int = 7; // NYI! Placeholder for Xianxia mod
EnumValue.add(Types, MANTIS, "MANTIS", {name:"mantis"});
public static const IMP:int = 8; // NYI! Placeholder from Revamp
EnumValue.add(Types, IMP, "IMP", {name:"imp"});
public static const COCKATRICE:int = 9; // NYI! Placeholder from Revamp
EnumValue.add(Types, COCKATRICE, "COCKATRICE", {name:"cockatrice"});
public static const RED_PANDA:int = 10; // NYI! Placeholder from Revamp
// Don't forget to add new types in DebugMenu.as list CLAW_TYPE_CONSTANTS
EnumValue.add(Types, RED_PANDA, "RED_PANDA", {name:"red panda"});

public var tone:String = "";

public function Claws(creature:Creature) {
super(creature,"clawsPart",["tone"]);
Expand Down Expand Up @@ -60,4 +79,4 @@ public class Claws extends SaveableBodyPart {
savedata.clawTone = tone;
}
}
}
}
54 changes: 52 additions & 2 deletions classes/classes/BodyParts/Ears.as
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,102 @@
package classes.BodyParts {
import classes.internals.EnumValue;

public class Ears extends BodyPart {
/**
* Entry properties:
* - value: numerical id (0, 10)
* - id: name of the constant ("HUMAN", "HORSE")
* - name: human-readable name, ("human", "horse")
*/
public static var Types:/*EnumValue*/Array = [];

public static const HUMAN:int = 0;
EnumValue.add(Types, HUMAN, "HUMAN", {name: "human"});
public static const HORSE:int = 1;
EnumValue.add(Types, HORSE, "HORSE", {name: "horse"});
public static const DOG:int = 2;
EnumValue.add(Types, DOG, "DOG", {name: "dog"});
public static const COW:int = 3;
EnumValue.add(Types, COW, "COW", {name: "cow"});
public static const ELFIN:int = 4;
EnumValue.add(Types, ELFIN, "ELFIN", {name: "elfin"});
public static const CAT:int = 5;
EnumValue.add(Types, CAT, "CAT", {name: "cat"});
public static const LIZARD:int = 6;
EnumValue.add(Types, LIZARD, "LIZARD", {name: "lizard"});
public static const BUNNY:int = 7;
EnumValue.add(Types, BUNNY, "BUNNY", {name: "bunny"});
public static const KANGAROO:int = 8;
EnumValue.add(Types, KANGAROO, "KANGAROO", {name: "kangaroo"});
public static const FOX:int = 9;
EnumValue.add(Types, FOX, "FOX", {name: "fox"});
public static const DRAGON:int = 10;
EnumValue.add(Types, DRAGON, "DRAGON", {name: "dragon"});
public static const RACCOON:int = 11;
EnumValue.add(Types, RACCOON, "RACCOON", {name: "raccoon"});
public static const MOUSE:int = 12;
EnumValue.add(Types, MOUSE, "MOUSE", {name: "mouse"});
public static const FERRET:int = 13;
EnumValue.add(Types, FERRET, "FERRET", {name: "ferret"});
public static const PIG:int = 14;//button 0 on 2nd page of metamorph
EnumValue.add(Types, PIG, "PIG", {name: "pig"});
public static const RHINO:int = 15;
EnumValue.add(Types, RHINO, "RHINO", {name: "rhino"});
public static const ECHIDNA:int = 16;
EnumValue.add(Types, ECHIDNA, "ECHIDNA", {name: "echidna"});
public static const DEER:int = 17;
EnumValue.add(Types, DEER, "DEER", {name: "deer"});
public static const WOLF:int = 18;
EnumValue.add(Types, WOLF, "WOLF", {name: "wolf"});
public static const LION:int = 19;
EnumValue.add(Types, LION, "LION", {name: "lion"});
public static const YETI:int = 20;
EnumValue.add(Types, YETI, "YETI", {name: "yeti"});
public static const ORCA:int = 21;
EnumValue.add(Types, ORCA, "ORCA", {name: "orca"});
public static const ORCA2:int = 22;
EnumValue.add(Types, ORCA2, "ORCA2", {name: "orca"});
public static const SNAKE:int = 23;
EnumValue.add(Types, SNAKE, "SNAKE", {name: "snake"});
public static const GOAT:int = 24;
EnumValue.add(Types, GOAT, "GOAT", {name: "goat"});
public static const ONI:int = 25;
EnumValue.add(Types, ONI, "ONI", {name: "oni"});
public static const ELVEN:int = 26;
EnumValue.add(Types, ELVEN, "ELVEN", {name: "elven"});
public static const RAIJU:int = 27;
EnumValue.add(Types, RAIJU, "RAIJU", {name: "raiju"});
public static const BAT:int = 28;
EnumValue.add(Types, BAT, "BAT", {name: "bat"});
public static const VAMPIRE:int = 29;//button 0 on 3rd page of metamorph
EnumValue.add(Types, VAMPIRE, "VAMPIRE", {name: "vampire"});
public static const RED_PANDA:int = 30;
EnumValue.add(Types, RED_PANDA, "RED_PANDA", {name: "red-panda"});
public static const AVIAN:int = 31;
EnumValue.add(Types, AVIAN, "AVIAN", {name: "avian"});
public static const GRYPHON:int = 32;
EnumValue.add(Types, GRYPHON, "GRYPHON", {name: "gryphon"});
public static const CAVE_WYRM:int = 33;
EnumValue.add(Types, CAVE_WYRM, "CAVE_WYRM", {name: "cave wyrm"});
public static const BEAR:int = 34;
EnumValue.add(Types, BEAR, "BEAR", {name: "bear"});
public static const PANDA:int = 35;
EnumValue.add(Types, PANDA, "PANDA", {name: "panda"});
public static const SHARK:int = 36;
EnumValue.add(Types, SHARK, "SHARK", {name: "shark"});
public static const DISPLACER:int = 37;
EnumValue.add(Types, DISPLACER, "DISPLACER", {name: "displacer"});
public static const MELKIE:int = 38;
EnumValue.add(Types, MELKIE, "MELKIE", {name: "melkie"});
public static const GREMLIN:int = 39;
EnumValue.add(Types, GREMLIN, "GREMLIN", {name: "gremlin"});
public static const WEASEL:int = 40;
EnumValue.add(Types, WEASEL, "WEASEL", {name: "weasel"});
public static const SQUIRREL:int = 41;
// Don't forget to add new types in DebugMenu.as list EAR_TYPE_CONSTANTS
EnumValue.add(Types, SQUIRREL, "SQUIRREL", {name: "squirrel"});

public function Ears() {
super(null, null);
}
}
}
}
Loading

0 comments on commit 4f08ef2

Please sign in to comment.