diff --git a/resources/data/map/littleGame_1.json b/resources/data/map/littleGame_1.json index b5f5f52..7ac1303 100644 --- a/resources/data/map/littleGame_1.json +++ b/resources/data/map/littleGame_1.json @@ -1,18 +1,13 @@ { - "background_type":0, - "choosebar_type":1, - "shovel":1, + "background_type":6, + "choosebar_type":2, + "shovel":0, "spawn_zombies":"auto", - "num_flags":3, - "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "PoleVaultingZombie"], + "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "NewspaperZombie", "PoleVaultingZombie"], + "num_flags":4, "inevitable_zombie_list":{"20":["BucketheadZombie"]}, "card_pool":[ - {"name":"Peashooter"}, - {"name":"SnowPea"}, - {"name":"WallNut"}, - {"name":"CherryBomb"}, - {"name":"RepeaterPea"}, - {"name":"Chomper"}, - {"name":"PotatoMine"} + {"name":"WallNutBowling"}, + {"name":"RedWallNutBowling"} ] } diff --git a/resources/data/map/littleGame_2.json b/resources/data/map/littleGame_2.json index 7ac1303..b5f5f52 100644 --- a/resources/data/map/littleGame_2.json +++ b/resources/data/map/littleGame_2.json @@ -1,13 +1,18 @@ { - "background_type":6, - "choosebar_type":2, - "shovel":0, + "background_type":0, + "choosebar_type":1, + "shovel":1, "spawn_zombies":"auto", - "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "NewspaperZombie", "PoleVaultingZombie"], - "num_flags":4, + "num_flags":3, + "included_zombies":["Zombie", "ConeheadZombie", "BucketheadZombie", "PoleVaultingZombie"], "inevitable_zombie_list":{"20":["BucketheadZombie"]}, "card_pool":[ - {"name":"WallNutBowling"}, - {"name":"RedWallNutBowling"} + {"name":"Peashooter"}, + {"name":"SnowPea"}, + {"name":"WallNut"}, + {"name":"CherryBomb"}, + {"name":"RepeaterPea"}, + {"name":"Chomper"}, + {"name":"PotatoMine"} ] } diff --git a/resources/data/map/littleGame_3.json b/resources/data/map/littleGame_3.json new file mode 100644 index 0000000..7ede7e7 --- /dev/null +++ b/resources/data/map/littleGame_3.json @@ -0,0 +1,20 @@ +{ + "background_type":1, + "choosebar_type":1, + "shovel":1, + "spawn_zombies":"auto", + "num_flags":3, + "included_zombies":["Zombie", "ConeheadZombie", + "BucketheadZombie", "NewspaperZombie", + "FootballZombie", "ScreenDoorZombie"], + "inevitable_zombie_list":{"30":["FootballZombie"]}, + "card_pool":[ + {"name":"PuffShroom"}, + {"name":"ScaredyShroom"}, + {"name":"IceShroom"}, + {"name":"HypnoShroom"}, + {"name":"DoomShroom"}, + {"name":"GraveBuster"}, + {"name":"FumeShroom"} + ] +} diff --git a/resources/data/map/littleGame_4.json b/resources/data/map/littleGame_4.json new file mode 100644 index 0000000..a434873 --- /dev/null +++ b/resources/data/map/littleGame_4.json @@ -0,0 +1,21 @@ +{ + "background_type":2, + "choosebar_type":1, + "shovel":1, + "spawn_zombies":"auto", + "num_flags":4, + "included_zombies":["Zombie", "ConeheadZombie", + "BucketheadZombie", "SnorkelZombie", + "Zomboni"], + "inevitable_zombie_list":{"30":["BucketheadZombie"]}, + "card_pool":[ + {"name":"Lilypad"}, + {"name":"TorchWood"}, + {"name":"TallNut"}, + {"name":"TangleKlep"}, + {"name":"Spikeweed"}, + {"name":"Squash"}, + {"name":"Jalapeno"}, + {"name":"Threepeater"} + ] +} diff --git a/resources/graphics/Cards/card_fumeshroom_move.png b/resources/graphics/Cards/card_fumeshroom_move.png new file mode 100644 index 0000000..f48ecf6 Binary files /dev/null and b/resources/graphics/Cards/card_fumeshroom_move.png differ diff --git a/resources/graphics/Cards/card_gravebuster_move.png b/resources/graphics/Cards/card_gravebuster_move.png new file mode 100644 index 0000000..80a5874 Binary files /dev/null and b/resources/graphics/Cards/card_gravebuster_move.png differ diff --git a/resources/graphics/Cards/card_hypnoshroom_move.png b/resources/graphics/Cards/card_hypnoshroom_move.png new file mode 100644 index 0000000..e212860 Binary files /dev/null and b/resources/graphics/Cards/card_hypnoshroom_move.png differ diff --git a/resources/graphics/Cards/card_iceshroom_move.png b/resources/graphics/Cards/card_iceshroom_move.png new file mode 100644 index 0000000..e0daf0b Binary files /dev/null and b/resources/graphics/Cards/card_iceshroom_move.png differ diff --git a/resources/graphics/Cards/card_jalapeno_move.png b/resources/graphics/Cards/card_jalapeno_move.png new file mode 100644 index 0000000..e88b55a Binary files /dev/null and b/resources/graphics/Cards/card_jalapeno_move.png differ diff --git a/resources/graphics/Cards/card_puffshroom_move.png b/resources/graphics/Cards/card_puffshroom_move.png new file mode 100644 index 0000000..3a25bad Binary files /dev/null and b/resources/graphics/Cards/card_puffshroom_move.png differ diff --git a/resources/graphics/Cards/card_scaredshroom_move.png b/resources/graphics/Cards/card_scaredshroom_move.png new file mode 100644 index 0000000..625254d Binary files /dev/null and b/resources/graphics/Cards/card_scaredshroom_move.png differ diff --git a/resources/graphics/Cards/card_seashroom_move.png b/resources/graphics/Cards/card_seashroom_move.png new file mode 100644 index 0000000..ecd8bbe Binary files /dev/null and b/resources/graphics/Cards/card_seashroom_move.png differ diff --git a/resources/graphics/Cards/card_spikeweed_move.png b/resources/graphics/Cards/card_spikeweed_move.png new file mode 100644 index 0000000..a4a70f8 Binary files /dev/null and b/resources/graphics/Cards/card_spikeweed_move.png differ diff --git a/resources/graphics/Cards/card_squash_move.png b/resources/graphics/Cards/card_squash_move.png new file mode 100644 index 0000000..fc667cb Binary files /dev/null and b/resources/graphics/Cards/card_squash_move.png differ diff --git a/resources/graphics/Cards/card_starfruit_move.png b/resources/graphics/Cards/card_starfruit_move.png new file mode 100644 index 0000000..45999fa Binary files /dev/null and b/resources/graphics/Cards/card_starfruit_move.png differ diff --git a/resources/graphics/Cards/card_tallnut_move.png b/resources/graphics/Cards/card_tallnut_move.png new file mode 100644 index 0000000..67c2177 Binary files /dev/null and b/resources/graphics/Cards/card_tallnut_move.png differ diff --git a/resources/graphics/Cards/card_tangleklep_move.png b/resources/graphics/Cards/card_tangleklep_move.png new file mode 100644 index 0000000..f7f208c Binary files /dev/null and b/resources/graphics/Cards/card_tangleklep_move.png differ diff --git a/resources/graphics/Cards/card_threepeashooter_move.png b/resources/graphics/Cards/card_threepeashooter_move.png new file mode 100644 index 0000000..c46aab5 Binary files /dev/null and b/resources/graphics/Cards/card_threepeashooter_move.png differ diff --git a/resources/graphics/Cards/card_torchwood_move.png b/resources/graphics/Cards/card_torchwood_move.png new file mode 100644 index 0000000..b4fbb2c Binary files /dev/null and b/resources/graphics/Cards/card_torchwood_move.png differ diff --git a/source/constants.py b/source/constants.py index 99c82bf..736d4a8 100755 --- a/source/constants.py +++ b/source/constants.py @@ -1,7 +1,7 @@ # 冒险模式起始关卡 START_LEVEL_NUM = 1 # 小游戏模式起始关卡 -START_LITTLE_GAME_NUM = 1 +START_LITTLE_GAME_NUM = 4 # 游戏速度倍率(调试用) GAME_RATE = 1 diff --git a/source/state/level.py b/source/state/level.py index 6a4a20d..e89f63d 100644 --- a/source/state/level.py +++ b/source/state/level.py @@ -158,6 +158,9 @@ class Level(tool.State): if randint(1, 3) == 1: # 1/3概率水上,暂时人为设定 if newZombie in c.CONVERT_ZOMBIE_IN_POOL: newZombie = c.CONVERT_ZOMBIE_IN_POOL[newZombie] + # 首先几轮不出水生僵尸 + elif newZombie in c.WATER_ZOMBIE: + continue if c.CREATE_ZOMBIE_DICT[newZombie][0] <= volume: zombieList.append(newZombie) volume -= c.CREATE_ZOMBIE_DICT[newZombie][0]