diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index a7e8667..017616d 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -180,18 +180,12 @@ "IncludedFiles": [ {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatestatlas.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Forest Battle","resourceVersion":"1.0","name":"forestatlas.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Forest Battle","resourceVersion":"1.0","name":"forestbattle.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Forest Battle","resourceVersion":"1.0","name":"forestbattle.size","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Plains Battle","resourceVersion":"1.0","name":"plainsatlas.png","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Plains Battle","resourceVersion":"1.0","name":"plainsbattle.dat","resourceType":"GMIncludedFile",}, - {"CopyToMask":-1,"filePath":"datafiles/Plains Battle","resourceVersion":"1.0","name":"plainsbattle.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapatlas.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatestatlas.png","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2.3.3.574", diff --git a/eastern flames/scripts/c_loadstageone/c_loadstageone.gml b/eastern flames/scripts/c_loadstageone/c_loadstageone.gml index 9742ec0..3febed2 100644 --- a/eastern flames/scripts/c_loadstageone/c_loadstageone.gml +++ b/eastern flames/scripts/c_loadstageone/c_loadstageone.gml @@ -4,47 +4,47 @@ function c_loadstageone() { c_addweapon(chara, wp[$"iron sword"], true); var kris = c_inheritunit(10, 5, un.kris, ARMY.THEM); c_addweapon(kris, wp[$"iron sword"], true, true);*/ - var momiji = c_inheritunit(5, 9, un.Momiji, ARMY.US); + var momiji = c_inheritunit(5, 9, un.momiji, ARMY.US); c_addweapon(momiji, wp[$"iron sword"], true); - var nitori = c_inheritunit(4, 10, un.Nitori, ARMY.US); + var nitori = c_inheritunit(4, 10, un.nitori, ARMY.US); c_addweapon(nitori, wp[$"iron sword"], true); - var bunny = c_inheritunit(19, 3, un[$"Bunny Buddy"], ARMY.THEM); + bunny = c_inheritunit(19, 3, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(17, 2, un[$"Final Bunny"], ARMY.THEM); + bunny = c_inheritunit(17, 2, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(8, 2, un[$"Forest Bunny"], ARMY.THEM); + var bunny = c_inheritunit(8, 2, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(10, 3, un[$"Plains Bunny"], ARMY.THEM); + bunny = c_inheritunit(10, 3, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(12, 4, un[$"Mountain Bunny"], ARMY.THEM); + bunny = c_inheritunit(12, 4, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(9, 10, un[$"Bunny Forerunner"], ARMY.THEM); + bunny = c_inheritunit(9, 10, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(10, 8, un[$"Bold Bunny"], ARMY.THEM); + bunny = c_inheritunit(10, 8, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(12, 10, un[$"Admiring Bunny"], ARMY.THEM); + bunny = c_inheritunit(12, 10, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(13, 7, un[$"Bunny in the Middle"], ARMY.THEM); + bunny = c_inheritunit(13, 7, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(16, 12, un.Bnuuy, ARMY.THEM); + bunny = c_inheritunit(16, 12, un.bunny, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(16, 5, un[$"Bored Bunny"], ARMY.THEM); + bunny = c_inheritunit(16, 5, un.bunnyguard, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(17, 6, un[$"Veteran Bunny"], ARMY.THEM); + bunny = c_inheritunit(17, 6, un.bunnyguard, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(18, 7, un[$"Rabbit"], ARMY.THEM); + bunny = c_inheritunit(18, 7, un.bunnyguard, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - bunny = c_inheritunit(19, 13, un[$"Sneaky Bunny"], ARMY.THEM); + bunny = c_inheritunit(19, 13, un.bunnythief, ARMY.THEM); c_addweapon(bunny, wp[$"iron sword"], true); - var reisen = c_inheritunit(19, 1, un[$"Rei'sen"], true, ARMY.THEM); + var reisen = c_inheritunit(19, 1, un[$"rei'sen"], true, ARMY.THEM); c_addweapon(reisen, wp[$"iron sword"], true); } \ No newline at end of file diff --git a/eastern flames/scripts/weapon/weapon.gml b/eastern flames/scripts/weapon/weapon.gml index c51f4d8..f175f60 100644 --- a/eastern flames/scripts/weapon/weapon.gml +++ b/eastern flames/scripts/weapon/weapon.gml @@ -35,19 +35,6 @@ nu weapon("nothing", "it's literally nothing", WPTYPE.NULL); nu weapon("knife", "bleed, bleed", WPTYPE.SWORD, [new statmod(st.str, 20, add), new statmod(st.hit, 100, add)]); nu weapon("iron sword", "made of a cringe material", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]); -nu weapon("Blade", "it's blade.", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]); - - -nu weapon("Maple Leaf", "eh? not going for true end?", WPTYPE.SWORD, [new statmod(st.str, 5, add), new statmod(st.hit, 95, add)]); -nu weapon("Microlaser", "special science laser instead of magic!", WPTYPE.SWORD, [new statmod(st.str, 4, add), new statmod(st.hit, 90, add)]); -nu weapon("Wrench", "a wrench of a common material", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 60, add)]); - -nu weapon("Bayonet", "it's out of ammo...", WPTYPE.SWORD, [new statmod(st.str, 9, add), new statmod(st.hit, 80, add)]); -nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]); -nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]); -nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]); -nu weapon("", "", WPTYPE.SWORD, [new statmod(st.str, 6, add), new statmod(st.hit, 90, add)]); - function c_modifierreset(target) { var dudes = variable_struct_get_names(target.data); var lads = variable_struct_get_names(st); diff --git a/eastern flames/scripts/x_units/x_units.gml b/eastern flames/scripts/x_units/x_units.gml index 4462eb4..f0cf6c1 100644 --- a/eastern flames/scripts/x_units/x_units.gml +++ b/eastern flames/scripts/x_units/x_units.gml @@ -29,7 +29,7 @@ mydata = { nu unit(mydata, mydata, [st.hp.add(110), st.str.add(20), st.def.add(10), st.spd.add(5), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); mydata = { - name: "Momiji", + name: "momiji", desc: "", skills: [], idle: s_momiji, @@ -39,7 +39,7 @@ mydata = { } nu unit(mydata, mydata, [st.hp.add(30), st.str.add(12), st.def.add(8), st.spd.add(10), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); mydata = { - name: "Nitori", + name: "nitori", desc: "", skills: [], idle: s_bunny, @@ -60,100 +60,8 @@ mydata = { aitype: AI.KILLER, } nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); - mydata = { - name: "Bunny Forerunner", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Bold Bunny", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Admiring Bunny", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Bunny in the Middle", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Forest Bunny", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Plains Bunny", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Mountain Bunny", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Bunny Buddy", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Final Bunny", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.KILLER, -} -nu unit(mydata, mydata, [st.hp.add(25), st.str.add(9), st.def.add(7), st.spd.add(7), st.mov.add(4), st.hit.add(0), st.rng.add(1)]); - -mydata = { - name: "Bored Bunny", + name: "bunnyguard", desc: "", skills: [], idle: s_bunny, @@ -163,37 +71,7 @@ mydata = { } nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]); mydata = { - name: "Veteran Bunny", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.WAITER, -} -nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Rabbit", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.WAITER, -} -nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Bnuuy", - desc: "", - skills: [], - idle: s_bunny, - up: s_bunnyup, - down: s_bunnydown, - aitype: AI.WAITER, -} -nu unit(mydata, mydata, [st.hp.add(20), st.str.add(8), st.def.add(8), st.spd.add(10), st.mov.add(0), st.hit.add(0), st.rng.add(1)]); -mydata = { - name: "Sneaky Bunny", + name: "bunnythief", desc: "", skills: [], idle: s_bunny, @@ -205,7 +83,7 @@ nu unit(mydata, mydata, [st.hp.add(20), st.str.add(6), st.def.add(4), st.spd.add mydata = { - name: "Rei'sen", + name: "rei'sen", desc: "", skills: [], idle: s_reisen,