diff --git a/Platform/Apple/tools/PackPartitions/src/org/demo/PackPartitions.groovy b/Platform/Apple/tools/PackPartitions/src/org/demo/PackPartitions.groovy index 5303258e..2f9442b8 100644 --- a/Platform/Apple/tools/PackPartitions/src/org/demo/PackPartitions.groovy +++ b/Platform/Apple/tools/PackPartitions/src/org/demo/PackPartitions.groovy @@ -1512,10 +1512,9 @@ class PackPartitions assembleCode("tileEngine", "src/tile/") compileModule("gameloop", "src/plasma/") - compileModule("gen_globalScripts", "src/plasma/") - compileModule("globalScripts", "src/plasma/") compileModule("combat", "src/plasma/") compileModule("party", "src/plasma/") + compileModule("gen_globalScripts", "src/plasma/") compileModule("gen_enemies", "src/plasma/") compileModule("gen_items", "src/plasma/") compileModule("gen_players", "src/plasma/") diff --git a/Platform/Apple/virtual/src/plasma/globalScripts.pla b/Platform/Apple/virtual/src/plasma/globalScripts.pla deleted file mode 100644 index 4168f634..00000000 --- a/Platform/Apple/virtual/src/plasma/globalScripts.pla +++ /dev/null @@ -1,212 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2015 The 8-Bit Bunch. Licensed under the Apache License, Version 1.1 -// (the "License"); you may not use this file except in compliance with the License. -// You may obtain a copy of the License at . -// Unless required by applicable law or agreed to in writing, software distributed under -// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF -// ANY KIND, either express or implied. See the License for the specific language -// governing permissions and limitations under the License. -/////////////////////////////////////////////////////////////////////////////////////////////////// - -include "gamelib.plh" -include "playtype.plh" -include "gen_images.plh" - -predef new_Armor_Chaps, new_Armor_ShamanHeaddress, new_Armor_TahnkuPants, new_Armor_TahnkuVest -predef new_Weapon_Handgun, new_Weapon_SpiritBow, new_Weapon_SpiritBlade -predef new_Player_Hue_Hauser, new_Player_Mokahnu - -word[] funcTbl = @new_Armor_Chaps, @new_Armor_ShamanHeaddress, @new_Armor_TahnkuPants, @new_Armor_TahnkuVest -word = @new_Weapon_Handgun, @new_Weapon_SpiritBow, @new_Weapon_SpiritBlade -word = @new_Player_Hue_Hauser, @new_Player_Mokahnu - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Armor_Chaps - word p - p = mmgr(HEAP_ALLOC, TYPE_ARMOR) - p=>s_name = mmgr(HEAP_INTERN, "Chaps") - p=>s_itemKind = mmgr(HEAP_INTERN, "pants") - p=>w_price = -99 // for now - // no modifiers, max uses, etc. for now - p->b_armorValue = 2 - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Armor_ShamanHeaddress() - word p - p = mmgr(HEAP_ALLOC, TYPE_ARMOR) - p=>s_name = mmgr(HEAP_INTERN, "Shaman Headdress(es)") - p=>s_itemKind = mmgr(HEAP_INTERN, "hat(s)") - p=>w_price = -99 // for now - // no modifiers, max uses, etc. for now - p->b_armorValue = 2 - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Armor_TahnkuPants() - word p - p = mmgr(HEAP_ALLOC, TYPE_ARMOR) - p=>s_name = mmgr(HEAP_INTERN, "Tahnku Pants") - p=>s_itemKind = mmgr(HEAP_INTERN, "pants") - p=>w_price = -99 // for now - // no modifiers, max uses, etc. for now - p->b_armorValue = 2 - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Armor_TahnkuVest() - word p - p = mmgr(HEAP_ALLOC, TYPE_ARMOR) - p=>s_name = mmgr(HEAP_INTERN, "Tahnku Vest(s)") - p=>s_itemKind = mmgr(HEAP_INTERN, "shirt(s)") - p=>w_price = -99 // for now - // no modifiers, max uses, etc. for now - p->b_armorValue = 2 - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Weapon_Handgun - word p - p = mmgr(HEAP_ALLOC, TYPE_WEAPON) - p=>s_name = mmgr(HEAP_INTERN, "Handgun") - p=>s_itemKind = mmgr(HEAP_INTERN, "handgun(s)") - p=>w_price = -99 // for now - // no modifiers, max uses, etc. for now - p=>s_ammoKind = mmgr(HEAP_INTERN, "Bullet(s)") - p->b_clipSize = 6 - p->b_clipCurrent = p->b_clipSize - p=>r_meleeDmg = encodeDice(1, 6, 0) // 1d6 - p=>r_projectileDmg = encodeDice(1, 6, 0) // 1d6 - p->ba_attacks[0] = 1 // single attack - p->b_weaponRange = 40 - p=>s_combatText = mmgr(HEAP_INTERN, "shoots") - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Weapon_SpiritBow - word p - p = mmgr(HEAP_ALLOC, TYPE_WEAPON) - p=>s_name = mmgr(HEAP_INTERN, "Spirit Bow") - p=>s_itemKind = mmgr(HEAP_INTERN, "bow(s)") - p=>w_price = -99 // for now - // no modifiers, max uses, etc. for now - p=>s_ammoKind = mmgr(HEAP_INTERN, "Arrow(s)") - p->b_clipSize = 12 - p->b_clipCurrent = p->b_clipSize - p=>r_meleeDmg = encodeDice(3, 6, 0) // 3d6 - p=>r_projectileDmg = encodeDice(2, 6, 5) // 2d6+5 - p->ba_attacks[0] = 1 // single attack - p->ba_attacks[1] = 3 // triple attack - p->b_weaponRange = 100 - p=>s_combatText = mmgr(HEAP_INTERN, "shoots") - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Weapon_SpiritBlade - word p - p = mmgr(HEAP_ALLOC, TYPE_WEAPON) - p=>s_name = mmgr(HEAP_INTERN, "Spirit Blade") - p=>s_itemKind = mmgr(HEAP_INTERN, "blade(s)") - p=>w_price = -99 // for now - // no modifiers, max uses, etc. for now - p=>s_ammoKind = NULL - p->b_clipSize = 0 - p->b_clipCurrent = p->b_clipSize - p=>r_meleeDmg = encodeDice(7, 6, 0) // 7d6 - p=>r_projectileDmg = 0 - p->ba_attacks[0] = 1 // single attack - p->b_weaponRange = 10 - p=>s_combatText = mmgr(HEAP_INTERN, "slices") - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Player_Hue_Hauser - word p, pItem - p = mmgr(HEAP_ALLOC, TYPE_PLAYER) - p=>s_name = mmgr(HEAP_INTERN, "Hue Hauser") - p->b_intelligence = 5 - p->b_strength = 6 - p->b_agility = 3 - p->b_stamina = 4 - p->b_charisma = 7 - p->b_spirit = 5 - p->b_luck = 5 - - p=>w_maxHealth = 12 - p=>w_health = 12 - - // Basic skills - p->b_aiming = 2 - p->b_dodging = 3 - - // Skills - addToList(p + p_skills, makeModifier("wilderness", 5)) - addToList(p + p_skills, makeModifier("handgun(s)", 1)) - - // Items - addToList(p + p_items, new_Armor_Chaps()) - addToList(p + p_items, new_Weapon_Handgun()) - - // Calculated attributes - calcPlayerArmor(p) - - // (No buffs or debuffs to start with.) - - // All done with the player. - return p -end - -/////////////////////////////////////////////////////////////////////////////////////////////////// -def new_Player_Mokahnu - word p, pItem - p = mmgr(HEAP_ALLOC, TYPE_PLAYER) - p=>s_name = mmgr(HEAP_INTERN, "Mokahnu") - p->b_intelligence = 7 - p->b_strength = 4 - p->b_agility = 6 - p->b_stamina = 6 - p->b_charisma = 7 - p->b_spirit = 10 - p->b_luck = 5 - - p=>w_maxHealth = 40 - p=>w_health = 40 - - p->b_playerFlags = PLAYER_FLAG_NPC - - // Basic skills - p->b_aiming = 4 - p->b_dodging = 3 - - // Skills - addToList(p + p_skills, makeModifier("wilderness", 5)) - addToList(p + p_skills, makeModifier("native bond", 10)) - addToList(p + p_skills, makeModifier("blade(s)", 3)) - addToList(p + p_skills, makeModifier("bow(s)", 3)) - addToList(p + p_skills, makeModifier("rifle(s)", 3)) - - // Items - addToList(p + p_items, new_Armor_ShamanHeaddress()) - addToList(p + p_items, new_Armor_TahnkuPants()) - addToList(p + p_items, new_Armor_TahnkuVest()) - addToList(p + p_items, new_Weapon_SpiritBow()) - addToList(p + p_items, new_Weapon_SpiritBlade()) - - // Calculated attributes - calcPlayerArmor(p) - - // (No buffs or debuffs to start with.) - - // All done with the player. - return p -end - -return @funcTbl -done \ No newline at end of file diff --git a/Platform/Apple/virtual/src/plasma/globalScripts.plh b/Platform/Apple/virtual/src/plasma/globalScripts.plh deleted file mode 100644 index 340bef41..00000000 --- a/Platform/Apple/virtual/src/plasma/globalScripts.plh +++ /dev/null @@ -1,19 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2015 The 8-Bit Bunch. Licensed under the Apache License, Version 1.1 -// (the "License"); you may not use this file except in compliance with the License. -// You may obtain a copy of the License at . -// Unless required by applicable law or agreed to in writing, software distributed under -// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF -// ANY KIND, either express or implied. See the License for the specific language -// governing permissions and limitations under the License. -/////////////////////////////////////////////////////////////////////////////////////////////////// - -const script_new_Armor_Chaps = 0 -const script_new_Armor_ShamanHeaddress = 2 -const script_new_Armor_TahnkuPants = 4 -const script_new_Armor_TahnkuVest = 6 -const script_new_Weapon_Handgun = 8 -const script_new_Weapon_SpiritBow = 10 -const script_new_Weapon_SpiritBlade = 12 -const script_new_Player_Hue_Hauser = 14 -const script_new_Player_Mokahnu = 16